Makefile.in: don't remove configure and config.h.in in make distclean.

In the GNU makefile standards, "make distclean" removes everything
that's not part of the source distribution; this does *not* include the
configure script or the config.h.in file, as those are in the release
tarball, so that building from a source tarball doesn't require having
autoconf.  This allows somebody building from the source tarball to do a
"make distclean" and then reconfigure.

Do, however, remove any release tarball in make distclean, by having
distclean depend on clean.

(cherry picked from commit 75d18375e7351d8295181d2bf1e2dce57b1498b2)

diff --git a/Makefile.in b/Makefile.in
index 5fc69adecd1dd19f9590c8143b748018fe021bee..6b0a5348e88fb372eb2834156907259f7a5e7eef 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -443,9 +443,9 @@ lint:
 clean:
        rm -f $(CLEANFILES) $(PROG)-`cat ${srcdir}/VERSION`.tar.gz
 
-distclean:
-       rm -f $(CLEANFILES) Makefile config.cache config.log config.status \
-           config.h config.h.in config.h.in~ configure configure~ configure.ac~ \
+distclean: clean
+       rm -f Makefile config.cache config.log config.status \
+           config.h config.h.in~ configure~ configure.ac~ \
            os-proto.h stamp-h stamp-h.in $(PROG).1 \
            libnetdissect.a tests/.failed tests/.passed \
            tests/failure-outputs.txt