gdm r6618 - in trunk: . gui/simple-greeter po tests

[mccann svn gnome org]

Author: mccann
Date: Wed Dec  3 05:31:00 2008
New Revision: 6618
URL: http://svn.gnome.org/viewvc/gdm?rev=6618&view=rev

Log:
2008-12-03  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/Makefile.am:
	* tests/Makefile.am:
	Fix more.



Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/tests/Makefile.am

Modified: trunk/gui/simple-greeter/Makefile.am
==============================================================================
--- trunk/gui/simple-greeter/Makefile.am	(original)
+++ trunk/gui/simple-greeter/Makefile.am	Wed Dec  3 05:31:00 2008
@@ -17,6 +17,7 @@
 	-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 @@
 	gdm-user-manager.h		\
 	$(NULL)
 
-libgdmuser_la_CPPFLAGS = 		\
-	$(DISABLE_DEPRECATED_CFLAGS)	\
-	$(NULL)
-
 libgdmuser_la_CFLAGS =			\
 	$(SIMPLE_GREETER_CFLAGS)	\
 	$(NULL)

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Dec  3 05:31:00 2008
@@ -85,6 +85,7 @@
 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

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Wed Dec  3 05:31:00 2008
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES =			\
+AM_CPPFLAGS =			\
 	-I.			\
 	-I..			\
 	-I$(top_srcdir)/common	\