From 59a220dd9f0102f10a049e38949e96a8c85fe33a Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 1 Jul 2015 19:40:23 -0400
Subject: [PATCH] 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>
---
 Makefile.in           | 3 ++-
 e2fsck/Makefile.in    | 3 ++-
 lib/blkid/Makefile.in | 2 +-
 lib/e2p/Makefile.in   | 2 +-
 lib/ss/Makefile.in    | 2 +-
 lib/uuid/Makefile.in  | 5 +++--
 util/Makefile.in      | 2 +-
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f5727a80..eedf7571 100644
--- 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 8e555ff8..8f7f3381 100644
--- 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 e020a77e..275ba844 100644
--- 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 38d2cad8..93d97c48 100644
--- 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 223a7f7e..cfe0f383 100644
--- 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 f51714b1..acdcea65 100644
--- 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 5171c1cc..96117d9e 100644
--- 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