diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bindings/python/Makefile.am | 3 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
4 files changed, 16 insertions, 1 deletions
@@ -1,5 +1,9 @@ 2008-03-29 Todd Zullinger <tmzullinger at users.sourceforge.net> + * bindings/python/Makefile.am + docs/reference/Makefile.am + src/Makefile.am: cleanup more of our dirs with make uninstall + * tests/test-rebuild-db.cc: include string.h to fix builds with gcc 4.3 (fixes SF tracker #1928618) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 0c11d02..7068081 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -60,4 +60,7 @@ gpod.py: $(SWIG_INTERFACES) test: $(MAKE) -C tests test + +uninstall-hook: + -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(gpoddir) endif diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 36a5720..9ae12d6 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -79,3 +79,6 @@ EXTRA_DIST += version.xml.in # Build the documentation when creating tarballs dist-hook-local: $(MAKE) all + +uninstall-hook: + -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR) diff --git a/src/Makefile.am b/src/Makefile.am index 1e5315b..5c606f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,8 @@ libgpod_la_SOURCES = \ libgpod_la_LDFLAGS = -version-info $(LIBGPOD_SO_VERSION) -no-undefined -libgpodincludedir = $(includedir)/gpod-1.0/gpod +libgpodincludebase = $(includedir)/gpod-1.0 +libgpodincludedir = $(libgpodincludebase)/gpod libgpodinclude_HEADERS = itdb.h noinst_HEADERS = \ db-artwork-debug.h \ @@ -38,3 +39,7 @@ noinst_HEADERS = \ INCLUDES=$(LIBGPOD_CFLAGS) LIBS=$(LIBGPOD_LIBS) + +uninstall-hook: + -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(libgpodincludedir) + -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(libgpodincludebase) |