Fix distcheckwip/gdbus-port

Add missing xml files to EXTRA_DIST and generated glue code to
BUILT_SOURCES.
Update .gitignore

4 files changed, 25 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 5d876752..915dfa14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,10 @@ configure.lineno
 gdm.conf
 gdm.conf-custom
 gdm-display-glue.h
+gdm-display-glue.c
 gdm-factory-slave-glue.h
+gdm-greeter-glue.h
+gdm-greeter-glue.c
 gdm-local-display-factory-glue.h
 gdm-local-display-factory-glue.c
 gdm-manager-glue.h
@@ -47,13 +50,19 @@ gdm-simple-greeter.desktop.in
 gdm-simple-greeter.schemas
 gdm-simple-slave-glue.h
 gdm-slave-glue.h
+gdm-slave-glue.c
 gdm-static-display-glue.h
+gdm-static-display-glue.c
 gdm-static-factory-display-glue.h
 gdm-stop
 gdm-transient-display-glue.h
+gdm-transient-display-glue.c
 gdm-xdmcp-chooser-display-glue.h
 gdm-xdmcp-chooser-slave-glue.h
+gdm-xdmcp-chooser-slave-glue.c
 gdm-xdmcp-greeter-display-glue.h
+gdm-xdmcp-display-glue.h
+gdm-xdmcp-display-glue.c
 gdm-slave-resources.*
 gnome-doc-utils.make
 GNOME_FastUserSwitchApplet.server
diff --git a/common/Makefile.am b/common/Makefile.am
index ad5c9147..41cdda66 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -149,6 +149,7 @@ test_settings_client_LDADD =		\
 
 CLEANFILES =			\
 	$(BUILT_SOURCES)	\
+	gdm-settings-glue.c	\
 	$(NULL)
 
 EXTRA_DIST = 			\
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 90ef5f7a..d2dd72b8 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -30,9 +30,6 @@ AM_CPPFLAGS = \
 
 BUILT_SOURCES =					\
 	gdm-slave-glue.h			\
-	gdm-simple-slave-glue.h			\
-	gdm-factory-slave-glue.h		\
-	gdm-product-slave-glue.h		\
 	gdm-xdmcp-chooser-slave-glue.h		\
 	gdm-display-glue.h			\
 	gdm-xdmcp-display-glue.h		\
@@ -136,8 +133,6 @@ test_session_SOURCES = 		\
 nodist_test_session_SOURCES = 	\
 	gdm-session-glue.c	\
 	gdm-session-glue.h	\
-	gdm-slave-resources.c	\
-	gdm-slave-resources.h	\
 	$(NULL)
 
 test_session_LDADD =		\
@@ -291,8 +286,6 @@ nodist_gdm_product_slave_SOURCES = 	\
 	gdm-product-display-glue.h	\
 	gdm-session-glue.c		\
 	gdm-session-glue.h		\
-	gdm-slave-resources.c		\
-	gdm-slave-resources.h		\
 	gdm-display-glue.c		\
 	gdm-display-glue.h		\
 	gdm-slave-glue.c		\
@@ -499,24 +492,31 @@ sbin_SCRIPTS =		\
 gdm: $(srcdir)/gdm.in
 	sed -e 's,[@]sbindir[@],$(sbindir),g' <$(srcdir)/gdm.in >gdm
 
-CLEANFILES =			\
-	gdm			\
-	$(BUILT_SOURCES)	\
+CLEANFILES =				\
+	gdm				\
+	$(BUILT_SOURCES)		\
+	gdm-slave-glue.c		\
+	gdm-xdmcp-chooser-slave-glue.c	\
+	gdm-session-glue.c		\
+	gdm-display-glue.c		\
+	gdm-xdmcp-display-glue.c	\
+	gdm-static-display-glue.c	\
+	gdm-transient-display-glue.c	\
+	gdm-local-display-factory-glue.c	\
+	gdm-product-display-glue.c	\
+	gdm-greeter-glue.c		\
 	$(NULL)
 
 EXTRA_DIST = 				\
 	gdm.in				\
 	gdm-slave.xml			\
-	gdm-simple-slave.xml		\
-	gdm-factory-slave.xml		\
-	gdm-product-slave.xml		\
 	gdm-xdmcp-chooser-slave.xml	\
-	gdm-session-direct.xml		\
-	gdm-manager.xml			\
 	gdm-display.xml			\
 	gdm-xdmcp-display.xml		\
 	gdm-static-display.xml		\
 	gdm-transient-display.xml	\
 	gdm-local-display-factory.xml	\
 	gdm-product-display.xml		\
+	gdm-greeter-server.xml		\
+	gdm-session.xml			\
 	$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ea434686..b2a74843 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,10 +28,7 @@ daemon/gdm-product-display.c
 daemon/gdm-product-slave.c
 daemon/gdm-server.c
 daemon/gdm-session-auditor.c
-daemon/gdm-session.c
 daemon/gdm-session-direct.c
-daemon/gdm-session-relay.c
-daemon/gdm-session-settings.c
 daemon/gdm-session-settings.c
 daemon/gdm-session-worker.c
 daemon/gdm-session-worker-job.c