diff options
| author | Brian Cameron <Brian.Cameron@Sun.Com> | 2005-01-28 18:14:38 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2005-01-28 18:14:38 +0000 |
| commit | 6547f64ca7d35aa129694b2693864701e9f67fb0 (patch) | |
| tree | b8bab1ecebe9130cd21969ba038541396563a16d /gui/greeter | |
| parent | 27e927e3073d4e5554cb65017f3e23f200ff2555 (diff) | |
| download | gdm-6547f64ca7d35aa129694b2693864701e9f67fb0.tar.gz | |
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.
Diffstat (limited to 'gui/greeter')
| -rw-r--r-- | gui/greeter/themes/circles/Makefile.am | 3 | ||||
| -rw-r--r-- | gui/greeter/themes/happygnome-list/Makefile.am | 4 | ||||
| -rw-r--r-- | gui/greeter/themes/happygnome/Makefile.am | 3 |
3 files changed, 10 insertions, 0 deletions
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 |