diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-12-03 05:31:00 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-12-03 05:31:00 +0000 |
| commit | 06ff8fcd6fda0490808a21c1d2198ef425d6f012 (patch) | |
| tree | 9b082aec6a96e6947e8914a4e4e460642172bd95 | |
| parent | d5951e5b37f0f1850142b715be1fbdbe843737fa (diff) | |
| download | gdm-06ff8fcd6fda0490808a21c1d2198ef425d6f012.tar.gz | |
Fix more.
2008-12-03 William Jon McCann <jmccann@redhat.com>
* gui/simple-greeter/Makefile.am:
* tests/Makefile.am:
Fix more.
svn path=/trunk/; revision=6618
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gui/simple-greeter/Makefile.am | 5 | ||||
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
5 files changed, 13 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2008-12-03 William Jon McCann <jmccann@redhat.com> + * gui/simple-greeter/Makefile.am: + * tests/Makefile.am: + Fix more. + +2008-12-03 William Jon McCann <jmccann@redhat.com> + * common/Makefile.am: Fix another diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am index 56f9f533..9b5834d8 100644 --- a/gui/simple-greeter/Makefile.am +++ b/gui/simple-greeter/Makefile.am @@ -17,6 +17,7 @@ AM_CPPFLAGS = \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DSBINDIR=\""$(sbindir)"\" \ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ + $(DISABLE_DEPRECATED_CFLAGS) \ $(GTK_CFLAGS) \ $(SIMPLE_GREETER_CFLAGS) \ $(POLKIT_GNOME_CFLAGS) \ @@ -40,10 +41,6 @@ libgdmuser_la_SOURCES = \ gdm-user-manager.h \ $(NULL) -libgdmuser_la_CPPFLAGS = \ - $(DISABLE_DEPRECATED_CFLAGS) \ - $(NULL) - libgdmuser_la_CFLAGS = \ $(SIMPLE_GREETER_CFLAGS) \ $(NULL) diff --git a/po/ChangeLog b/po/ChangeLog index 2a8b00d9..3ca4876a 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2008-12-03 William Jon McCann <jmccann@redhat.com> + + * POTFILES.in: Add missing file + 2008-12-02 William Jon McCann <jmccann@redhat.com> * POTFILES.in: Remove obsolete file diff --git a/po/POTFILES.in b/po/POTFILES.in index b8ebab59..db607a5f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -85,6 +85,7 @@ gui/simple-greeter/gdm-user.c gui/simple-greeter/gdm-user-chooser-widget.c gui/simple-greeter/greeter-main.c gui/user-switch-applet/applet.c +gui/user-switch-applet/gdm-entry-menu-item.c gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml utils/gdmflexiserver.c diff --git a/tests/Makefile.am b/tests/Makefile.am index f3ddc2f8..88794983 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ NULL = -INCLUDES = \ +AM_CPPFLAGS = \ -I. \ -I.. \ -I$(top_srcdir)/common \ |