From f923bf2a81e349f95310458651d7fe9a7291058b Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 26 Jan 2005 13:03:55 -0500 Subject: Fix "make uninstall" to make sure it removes everything that is installed. --- intl/ChangeLog | 7 ++++++- intl/Makefile.in | 2 ++ lib/ChangeLog | 4 ++++ lib/Makefile.library | 2 ++ misc/ChangeLog | 3 +++ misc/Makefile.in | 9 +++++++++ 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/intl/ChangeLog b/intl/ChangeLog index b15c4ef5..9fe90f2e 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,6 +1,11 @@ +2005-01-26 Theodore Ts'o + + * Makefile.in (uninstall-shlibs): Fix "make uninstall" by adding + an uninstall-shlibs target. + 2004-12-14 Theodore Ts'o - * Add install-shlib-strip target. Update Makefile.in to version + * Add install-shlibs-strip target. Update Makefile.in to version from gettext 0.14.1 2004-11-30 Theodore Ts'o diff --git a/intl/Makefile.in b/intl/Makefile.in index 5bb5f58d..7662781b 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -376,6 +376,8 @@ installcheck: install-shlibs: +uninstall-shlibs: + install-shlibs-strip: uninstall: diff --git a/lib/ChangeLog b/lib/ChangeLog index 225ed12b..147bb1a6 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2005-01-26 Theodore Ts'o + + * Makefile.library (uninstall-shlibs): Fix "make uninstall" + 2004-12-14 Theodore Ts'o * Makefile.elf-lib, Makefile.solaris-lib, Makefile.profile, diff --git a/lib/Makefile.library b/lib/Makefile.library index 585e1466..5cff608d 100644 --- a/lib/Makefile.library +++ b/lib/Makefile.library @@ -2,6 +2,8 @@ all:: subdirs $(LIBRARY).a install-shlibs:: +uninstall-shlibs:: + subdirs:: $(LIBRARY).a: $(OBJS) diff --git a/misc/ChangeLog b/misc/ChangeLog index ba99457e..1372ba64 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,5 +1,8 @@ 2005-01-26 Theodore Ts'o + * Makefile.in (uninstall): Make sure "make uninstall" removes + everything installed by the makefile. + * e2image.c (scramble_dir_block): Make sure the unused space in the '.' and '..' directory entries are cleared when e2image -rs is specified. diff --git a/misc/Makefile.in b/misc/Makefile.in index 95af3561..29afcb3c 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -283,6 +283,9 @@ uninstall: for i in $(USPROGS); do \ $(RM) -f $(DESTDIR)$(sbindir)/$$i; \ done + for i in $(LPROGS); do \ + $(RM) -f $(DESTDIR)$(libdir)/$$i; \ + done $(RM) -f $(DESTDIR)$(root_sbindir)/mkfs.ext2 \ $(DESTDIR)$(root_sbindir)/mkfs.ext3 for i in $(UPROGS); do \ @@ -296,6 +299,12 @@ uninstall: for i in $(UMANPAGES); do \ $(RM) -f $(DESTDIR)$(man1dir)/$$i; \ done + for i in findfs e2label ; do \ + $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \ + done + for i in fsck.ext2.8 fsck.ext3.8 ; do \ + $(RM) -f $(DESTDIR)$(man8dir)/$$i; \ + done clean: $(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \ -- cgit v1.2.1