Issue #349: none of automake's clean targets are suite for really cleaning up everyth...

diff --git a/Makefile.am b/Makefile.am
index bb4fb6a44045f83f55b4169c4ffbd5a6daf680ea..cd32b4cfa0483526a81f96bf897eba831540b437 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,13 +56,43 @@ libjson_c_la_SOURCES = \
        strerror_override.c \
        strerror_override_private.h
 
+
+DISTCLEANFILES=
+DISTCLEANFILES+= \
+       config.h \
+       json-c-uninstalled.pc \
+       json-c.pc \
+       json_config.h
+
 distclean-local:
        -rm -rf $(testsubdir)
-       -rm -rf config.h.in~ Makefile.in aclocal.m4 autom4te.cache/ config.guess config.sub depcomp install-sh ltmain.sh missing
-       -rm -f INSTALL test-driver tests/Makefile.in compile
 
-maintainer-clean-local:
-       -rm -rf configure
+JSON_CLEANFILES=
+JSON_CLEANFILES+= \
+       Makefile.in \
+       aclocal.m4 \
+       autom4te.cache/ \
+       compile \
+       config.guess \
+       config.h.in \
+       config.sub \
+       configure \
+       depcomp \
+       install-sh \
+       ltmain.sh \
+       missing \
+       test-driver \
+       tests/Makefile.in
+JSON_CLEANFILES+= \
+       libtool \
+       stamp-h1 \
+       stamp-h2
+
+# There's no built-in way to remove these after all the other
+# maintainer-clean steps happen, so do it explicitly here.
+really-clean:
+       $(MAKE) maintainer-clean
+       rm -rf ${JSON_CLEANFILES}
 
 uninstall-local:
        rm -rf "$(DESTDIR)@includedir@/json-c"