Fix "make clean" and "make distclean"

There were some generated files that weren't getting removed by the
clean and distclean targets; fix this.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/Makefile.in b/Makefile.in
index f5727a807967459909099458c46f01990a3052c9..eedf75719a982afd7e73b0b50d5c5553b77a29a0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,7 +115,8 @@ clean:: clean-recursive clean-local clean-doc
        $(RM) -f $(SUBS) 
 
 distclean: distclean-doc distclean-recursive
-       $(RM) -rf autom4te.cache e2fsprogs.spec ext2ed/Makefile po/stamp-po
+       $(RM) -rf autom4te.cache e2fsprogs.spec ext2ed/Makefile po/stamp-po \
+               asm_types.h config.log public_config.h parse-types.log
        $(MAKE) distclean-local 
 
 realclean: realclean-recursive realclean-local

diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 8e555ff8729eb78f373df227ac90d56838a0d0ee..8f7f3381b2a05fb4fb86781ba9c5303757b7000f 100644 (file)
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -264,7 +264,8 @@ uninstall:
 clean::
        $(RM) -f $(PROGS) \#* *\# *.s *.o *.a *~ core e2fsck.static \
                e2fsck.shared e2fsck.profiled flushb e2fsck.8 \
-               tst_problem tst_region tst_refcount e2fsck.conf.5 \
+               tst_problem tst_region tst_refcount tst_crc32 \
+               gen_crc32table e2fsck.conf.5 \
                prof_err.c prof_err.h test_profile
        $(RM) -rf profiled
 

diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index e020a77eb2fc2e0a01b5591ebf49995117283b7c..275ba84413a3bbca07c77a08b9daa220b4e787fa 100644 (file)
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -179,7 +179,7 @@ clean::
                tst_tag tst_types tests/*.out tests/*.ok \
                tests/*.img results test_probe core profiled/* \
                blkid.h blkid_types.h ../libblkid.a ../libblkid_p.a \
-               $(SMANPAGES) blkid
+               $(SMANPAGES) blkid blkid.pc
        @echo rmdir tests/tmp tests
        @(rmdir tests/tmp tests 2> /dev/null ; exit 0)
 

diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 38d2cad8fe68479e1e0181bd01d47ea6563b6e3e..93d97c483145a82cca65e07870f6d7ee858a328a 100644 (file)
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -102,7 +102,7 @@ uninstall::
 
 clean::
        $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/*
-       $(RM) -f ../libe2p.a ../libe2p_p.a tst_ostype tst_feature
+       $(RM) -f ../libe2p.a ../libe2p_p.a tst_ostype tst_feature e2p.pc
 
 mostlyclean:: clean
 distclean:: clean

diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 223a7f7e946ebaed64e105356cc4089e61fb1a8e..cfe0f383dd41fad751627287f9760bc06de02163 100644 (file)
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -172,7 +172,7 @@ check:: all test_ss
 clean::
        $(RM) -f ../libss.a libss.a mk_cmds ss_err.h ss_err.c std_rqs.c \
                tst_cmds.c test_ss test_out test.diff *.o *~ \#* *.bak core \
-               test_cmd.c
+               test_cmd.c ss.pc
 
 mostlyclean:: clean
 distclean:: clean

diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index f51714b16e4eb9ebe79d0e3030cd35cceb4d4195..acdcea65d433be8f626e3b03f3f7fd104f4a3d86 100644 (file)
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -167,8 +167,9 @@ uninstall::
        $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
 
 clean::
-       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* uuid.h
-       $(RM) -f ../libuuid.a ../libuuid_p.a tst_uuid uuid_time $(SMANPAGES)
+       $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* uuid.h \
+               ../libuuid.a ../libuuid_p.a tst_uuid uuid_time \
+               uuid.pc uuid_types.h $(SMANPAGES)
 
 check:: tst_uuid
        LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_uuid

diff --git a/util/Makefile.in b/util/Makefile.in
index 5171c1ccf706218f8427122029f77085cca2047b..96117d9e00191a5d39d5aa4b6146ea8e49901b1d 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -53,7 +53,7 @@ tarballs: gen-tarball
 
 clean::
        $(RM) -f $(PROGS) \#* *.s *.o *.a *~ core *.tar.gz gen-tarball \
-               copy-sparse dirpaths.h
+               copy-sparse dirpaths.h install-symlink
 
 mostlyclean: clean