[gdm] daemon: distcheck fixes

[Ray Strode <halfline src gnome org>]

commit 14064ad5dd43f3dc3a1c04c41b324574779ea72d
Author: Ray Strode <rstrode redhat com>
Date:   Tue Jul 17 04:32:23 2012 -0400

    daemon: distcheck fixes

 daemon/Makefile.am             |    8 +-
 daemon/factory-slave-main.c    |  262 ----------------------------------------
 data/Makefile.am               |    3 +-
 gui/simple-chooser/Makefile.am |    1 +
 gui/simple-greeter/Makefile.am |   13 ++-
 po/POTFILES.in                 |    6 +-
 po/POTFILES.skip               |    1 +
 7 files changed, 22 insertions(+), 272 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index fe116a8..59f1167 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -165,8 +165,6 @@ gdm_simple_slave_SOURCES = 		\
 	$(NULL)
 
 nodist_gdm_simple_slave_SOURCES = 	\
-	gdm-greeter-glue.c		\
-	gdm-greeter-glue.h		\
 	gdm-display-glue.c		\
 	gdm-display-glue.h		\
 	gdm-session-enum-types.c	\
@@ -386,6 +384,7 @@ CLEANFILES =					\
 	gdm-local-display-factory-glue.c	\
 	gdm-manager-glue.c			\
 	gdm-session-glue.c			\
+	gdm-session-enum-types.c		\
 	gdm-slave-glue.c			\
 	gdm-static-display-glue.c		\
 	gdm-transient-display-glue.c		\
@@ -396,12 +395,15 @@ CLEANFILES =					\
 
 EXTRA_DIST = 				\
 	gdm.in				\
+	gdm-manager.xml			\
+	gdm-session.xml			\
 	gdm-slave.xml			\
-	gdm-simple-slave.xml		\
 	gdm-xdmcp-chooser-slave.xml	\
 	gdm-display.xml			\
 	gdm-xdmcp-display.xml		\
 	gdm-static-display.xml		\
 	gdm-transient-display.xml	\
 	gdm-local-display-factory.xml	\
+	gdm-session-enum-types.c.in	\
+	gdm-session-enum-types.h.in	\
 	$(NULL)
diff --git a/data/Makefile.am b/data/Makefile.am
index 1982349..e3f8642 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -164,7 +164,8 @@ uninstall-hook:
 	$(DESTDIR)$(sysconfdir)/dconf/db/gdm.d \
 	$(DESTDIR)$(workingdir)/.config/dconf \
 	$(DESTDIR)$(screenshotdir) \
-	$(DESTDIR)$(xauthdir)
+	$(DESTDIR)$(xauthdir) \
+	$(DESTDIR)$(PAM_PREFIX)/pam.d
 
 	-rmdir \
 	$(DESTDIR)$(sysconfdir)/dconf/db/gdm.d/locks \
diff --git a/gui/simple-chooser/Makefile.am b/gui/simple-chooser/Makefile.am
index 8b9c003..3111b0b 100644
--- a/gui/simple-chooser/Makefile.am
+++ b/gui/simple-chooser/Makefile.am
@@ -3,6 +3,7 @@ NULL =
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/common				\
 	-I$(top_srcdir)/gui/libgdm			\
+	-I$(top_builddir)/gui/libgdm			\
 	-DAUTHDIR=\""$(authdir)"\"		 	\
 	-DDATADIR=\""$(datadir)"\"		 	\
 	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
index 1cd5fab..fdd8005 100644
--- a/gui/simple-greeter/Makefile.am
+++ b/gui/simple-greeter/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/common				\
 	-I$(top_builddir)/common			\
 	-I$(top_srcdir)/gui/libgdm			\
+	-I$(top_builddir)/gui/libgdm			\
 	-I$(top_srcdir)/gui/simple-greeter/libgdmsimplegreeter	\
 	-DDMCONFDIR=\""$(dmconfdir)"\"			\
 	-DGDMCONFDIR=\"$(gdmconfdir)\"                  \
@@ -42,7 +43,7 @@ gsm-client-glue.c gsm-client-glue.h : org.gnome.SessionManager.ClientPrivate.xml
 		--c-namespace Gsm				\
 		--interface-prefix=org.gnome.SessionManager		\
 		--generate-c-code=gsm-client-glue			\
-		org.gnome.SessionManager.ClientPrivate.xml
+		$(srcdir)/org.gnome.SessionManager.ClientPrivate.xml
 
 gsm-manager-glue.c gsm-manager-glue.h : org.gnome.SessionManager.xml Makefile.am
 	$(AM_V_GEN)gdbus-codegen 					\
@@ -51,7 +52,7 @@ gsm-manager-glue.c gsm-manager-glue.h : org.gnome.SessionManager.xml Makefile.am
 		--generate-c-code=gsm-manager-glue			\
 		--annotate "org.gnome.SessionManager"			\
 		           "org.gtk.GDBus.C.Name" Manager		\
-		org.gnome.SessionManager.xml
+		$(srcdir)/org.gnome.SessionManager.xml
 
 test_greeter_login_window_SOURCES = 	\
 	test-greeter-login-window.c	\
@@ -235,6 +236,12 @@ nodist_gdm_simple_greeter_SOURCES =     \
 	gsm-client-glue.c		\
 	gsm-client-glue.h
 
+CLEANFILES = \
+	gsm-manager-glue.c		\
+	gsm-manager-glue.h		\
+	gsm-client-glue.c		\
+	gsm-client-glue.h
+
 BUILT_SOURCES = gsm-client-glue.h gsm-manager-glue.h
 
 uidir = $(pkgdatadir)
@@ -243,6 +250,8 @@ ui_DATA = 					\
 	$(NULL)
 
 EXTRA_DIST = 						\
+	org.gnome.SessionManager.ClientPrivate.xml      \
+	org.gnome.SessionManager.xml                    \
 	$(ui_DATA)					\
 	$(NULL)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 454b060..56376f0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,12 +13,10 @@ common/gdm-signal-handler.c
 common/test-log.c
 common/test-settings-client.c
 common/test-settings-server.c
-daemon/factory-slave-main.c
 daemon/gdm-chooser-session.c
 daemon/gdm-display-access-file.c
 daemon/gdm-display.c
 daemon/gdm-display-store.c
-daemon/gdm-greeter-server.c
 daemon/gdm-greeter-session.c
 daemon/gdm-local-display-factory.c
 daemon/gdm-manager.c
@@ -33,19 +31,19 @@ daemon/gdm-slave.c
 daemon/gdm-slave-proxy.c
 daemon/gdm-static-display.c
 daemon/gdm-welcome-session.c
+daemon/gdm-xdmcp-chooser-slave.c
 daemon/gdm-xdmcp-display.c
 daemon/gdm-xdmcp-display-factory.c
 daemon/main.c
 daemon/session-worker-main.c
 daemon/simple-slave-main.c
-daemon/test-session.c
+daemon/test-session-client.c
 daemon/xdmcp-chooser-slave-main.c
 data/applications/gdm-simple-greeter.desktop.in.in
 data/applications/gnome-mag.desktop.in
 data/applications/gnome-shell.desktop.in
 data/applications/gok.desktop.in
 data/applications/orca-screen-reader.desktop.in
-data/applications/polkit-gnome-authentication-agent-1.desktop.in.in
 data/gdm.schemas.in.in
 data/org.gnome.login-screen.gschema.xml.in
 gui/simple-chooser/gdm-host-chooser-dialog.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1b9147f..5faa4e5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -8,5 +8,6 @@
 #
 data/applications/gdm-simple-greeter.desktop.in
 data/applications/polkit-gnome-authentication-agent-1.desktop.in
+data/applications/polkit-gnome-authentication-agent-1.desktop.in.in
 data/gdm.schemas.in