Added distuninstallcheck_listfiles for the files in /var/scrollkeeper,

Tue Jan 25 17:18:00 2005  Brian Cameron <Brian.Cameron@Sun.Com>

        * This patch makes gdm2 build with newer versions of the build
          tools.  Previously it was requiring automake-1.4, autoconf-1.4,
          and clocal-1.4.  Better error checking in the newer version
          caught the following issues:
        * Makefile.am:  Added distuninstallcheck_listfiles for the
          files in /var/scrollkeeper, which were causing "makedist"
          to fail.  Removed intltool-modules/XML/Parser/Style/OrigTree.pm
          from EXTRA_DIST since that file isn't required by newer
          versions of intltool.
        * omf.make, xmldocs.make:  Fixed errors in "makedist".   I found a
          pointer to the fix here:
          mail.gnome.org/archives/desktop-devel-list/2003-December/msg00587.html
        * gui/Makefile.am, gui/greeter/themes/circles/Makefile.am,
          gui/modules/Makefile.am, gui/greeter/themes/happygnome/Makefile.am,
          config/Makefile.am, gui/greeter/themes/happygnome-list/Makefile.am:
          Added clean-local and uninstall-hook to fix errors in "makedist".
          Made sure all *.desktop files are in EXTRA_DIST.
        * daemon/slave.c: Not related to above patches.  Fixed grammar again
          since we aren't in a string freeze.  Sorry for the confusion.

5 files changed, 26 insertions, 0 deletions

diff --git a/gui/Makefile.am b/gui/Makefile.am
index 0f88e29d..7e85c87f 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -136,10 +136,15 @@ gdmflexiserver_LDADD = \
 	-lviciousui-gnome
 
 Settingsdir = $(datadir)/gnome/capplets
+Settings_files = gdmphotosetup.desktop
 Settings_in_files = gdmphotosetup.desktop.in
 Settings_DATA = $(Settings_in_files:.desktop.in=.desktop)
 
 Systemdir = $(datadir)/applications
+System_files = \
+	gdmsetup.desktop	\
+	gdmflexiserver.desktop	\
+	gdmflexiserver-xnest.desktop
 System_in_files = \
 	gdmsetup.desktop.in		\
 	gdmflexiserver.desktop.in	\
@@ -168,6 +173,11 @@ EXTRA_DIST = \
 	$(Glade_DATA)		\
 	$(Icons_DATA)		\
 	$(System_DATA)		\
+	$(System_files)		\
 	$(System_in_files)	\
 	$(Settings_DATA)	\
+	$(Settings_files)	\
 	$(Settings_in_files)
+
+clean-local:
+	rm -f $(System_files) $(Settings_files)
diff --git a/gui/greeter/themes/circles/Makefile.am b/gui/greeter/themes/circles/Makefile.am
index 1cdda2e7..c4a3e9aa 100644
--- a/gui/greeter/themes/circles/Makefile.am
+++ b/gui/greeter/themes/circles/Makefile.am
@@ -14,3 +14,6 @@ circles_in_files = \
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = $(circles_DATA) $(circles_in_files)
+
+clean-local:
+	rm -f GdmGreeterTheme.desktop
diff --git a/gui/greeter/themes/happygnome-list/Makefile.am b/gui/greeter/themes/happygnome-list/Makefile.am
index 8a97bf9a..74915806 100644
--- a/gui/greeter/themes/happygnome-list/Makefile.am
+++ b/gui/greeter/themes/happygnome-list/Makefile.am
@@ -16,3 +16,7 @@ happygnome_in_files = \
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = $(happygnome_DATA) $(happygnome_in_files)
+
+clean-local:
+	/bin/rm -f GdmGreeterTheme.desktop
+
diff --git a/gui/greeter/themes/happygnome/Makefile.am b/gui/greeter/themes/happygnome/Makefile.am
index a6b3247e..af4d883b 100644
--- a/gui/greeter/themes/happygnome/Makefile.am
+++ b/gui/greeter/themes/happygnome/Makefile.am
@@ -16,3 +16,6 @@ happygnome_in_files = \
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = $(happygnome_DATA) $(happygnome_in_files)
+
+clean-local:
+	rm -f GdmGreeterTheme.desktop
diff --git a/gui/modules/Makefile.am b/gui/modules/Makefile.am
index 68086071..974d0cd7 100644
--- a/gui/modules/Makefile.am
+++ b/gui/modules/Makefile.am
@@ -51,6 +51,12 @@ EXTRA_DIST = \
 	AccessKeyMouseEvents.in \
 	AccessDwellMouseEvents.in
 
+uninstall-hook: 
+	rm -f $(DESTDIR)$(moduleconfdir)/AccessKeyMouseEvents \
+	$(DESTDIR)$(moduleconfdir)/factory-AccessKeyMouseEvents \
+	$(DESTDIR)$(moduleconfdir)/AccessDwellMouseEvents \
+	$(DESTDIR)$(moduleconfdir)/factory-AccessDwellMouseEvents
+
 install-data-hook: AccessKeyMouseEvents AccessDwellMouseEvents
 	if test '!' -d $(DESTDIR)$(moduleconfdir); then \
 		$(mkinstalldirs) $(DESTDIR)$(moduleconfdir); \