diff options
| author | James Henstridge <james@jamesh.id.au> | 2004-11-10 07:59:38 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2004-11-10 07:59:38 +0000 |
| commit | bc9e517842177250ffd708da9e89484eab89c842 (patch) | |
| tree | 9387022c50249419f0c4e5ae485686a94e817f56 /src | |
| parent | f3743bc49409de3cf56463a6f57adc9f29623539 (diff) | |
| download | mutter-bc9e517842177250ffd708da9e89484eab89c842.tar.gz | |
remove intltool stuff on distclean.
2004-11-10 James Henstridge <james@jamesh.id.au>
* Makefile.am (DISTCLEANFILES): remove intltool stuff on distclean.
* src/themes/Makefile.am (uninstall-local): add uninstall rule.
* src/Makefile.am (libmetacity_private_la_CFLAGS): set this
variable so that the files shared with metacity get compiled with
different names.
* configure.in: use more modern macros in some places, and make
sure that $ACLOCAL_AMFLAGS is set so that rebuilds work better.
* autogen.sh (conf_flags): use newer automake.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/themes/Makefile.am | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 391a79d37..5d3ffeb44 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -90,6 +90,9 @@ metacity_SOURCES= \ xprops.h \ $(EGGFILES) +# by setting libmetacity_private_la_CFLAGS, the files shared with +# metacity proper will be compiled with different names. +libmetacity_private_la_CFLAGS = libmetacity_private_la_SOURCES= \ gradient.c \ gradient.h \ @@ -164,7 +167,7 @@ VARIABLES=default_icon_data $(srcdir)/default_icon.png \ stock_delete_data $(srcdir)/stock_delete.png BUILT_SOURCES = inlinepixbufs.h -CLEANFILES = inlinepixbufs.h +CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas inlinepixbufs.h: $(IMAGES) $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h diff --git a/src/themes/Makefile.am b/src/themes/Makefile.am index 9d0bd5ee8..82c504e85 100644 --- a/src/themes/Makefile.am +++ b/src/themes/Makefile.am @@ -23,6 +23,20 @@ install-data-local: done) \ done +uninstall-local: + for THEME in $(THEMES); do \ + echo '-- Uninstalling theme '$$THEME; \ + (uninstallfiles=`find $(srcdir)/$$THEME -name "*.png" -o -name "*.xml"`; \ + for i in $$uninstallfiles; do \ + i=`basename $$i`; \ + echo '-- Removing '$$i ; \ + rm -f $(DESTDIR)$(THEME_DIR)/$$THEME/$(THEME_SUBDIR)/$$i ; \ + done); \ + rmdir $(DESTDIR)$(THEME_DIR)/$$THEME/$(THEME_SUBDIR) || :; \ + rmdir $(DESTDIR)$(THEME_DIR)/$$THEME || :; \ + done + -rmdir $(DESTDIR)$(THEME_DIR) + dist-hook: mkdir $(distdir)/themes; \ for THEME in $(THEMES); do \ |