aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-11-24 00:49:48 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-11-24 08:38:29 +0100
commit9f691be3d49840690f7d3a22e81e6fd3e03f0900 (patch)
tree400fa289eb39c684f7e6e7607c751affa1e97347
parent6b9dd0d409515622905df3eb7a792f72b674d9a1 (diff)
make: fix "make distclean"
Fixes #2097 Closes #2108
-rw-r--r--Makefile.am9
-rw-r--r--docs/Makefile.am3
2 files changed, 3 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index d225a09ec..8e5ef9110 100644
--- 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 17b3909ca..ae5ceecae 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -81,3 +81,6 @@ pdf: $(PDFPAGES)
rm $$foo.ps; \
echo "converted $< to $@")
+distclean:
+ rm -f $(CLEANFILES)
+