make: fix "make distclean"

Fixes #2097
Closes #2108

diff --git a/Makefile.am b/Makefile.am
index d225a09ec96a870c1cb08a89d007ada3107111d4..8e5ef9110d241cdb3f3a8dcd187c3b5dba626ca4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -217,15 +217,6 @@ examples:
 check-docs:
        @(cd docs/libcurl; $(MAKE) check)
 
-# This is a hook to have 'make clean' also clean up the docs and the tests
-# dir. The extra check for the Makefiles being present is necessary because
-# 'make distcheck' will make clean first in these directories _before_ it runs
-# this hook.
-clean-local:
-       @(if test -f tests/Makefile; then cd tests; $(MAKE) clean; fi)
-       @(if test -f docs/Makefile; then cd docs; $(MAKE) clean; fi)
-
-#
 # Build source and binary rpms. For rpm-3.0 and above, the ~/.rpmmacros
 # must contain the following line:
 # %_topdir /home/loic/local/rpm

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 17b3909ca77516251d38aa14398c452e1d3bd255..ae5ceecae71f2a53ebce8c75a9b03f44937871e4 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -81,3 +81,6 @@ pdf: $(PDFPAGES)
        rm $$foo.ps; \
        echo "converted $< to $@")
 
+distclean:
+       rm -f $(CLEANFILES)
+