Make clean, distclean, and extraclean consistently according to the

Gnu makefile guidelines.

Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:  Roy Fielding

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88809 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index e20fb8c6e9f01b6c62c949e74147ac5cec23238c..80c161fb5ffc53011d08b9529101a91c2fb226c7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.17-dev
 
+  *) Make clean, distclean, and extraclean consistently according to the
+     Gnu makefile guidelines.  [Justin Erenkrantz <jerenkrantz@ebuilt.com>]
+
   *) Fix errors in the renaming of the apr_threadattr_detach_xxx functions.
      This may have been causing problems stopping processes in the threaded
      mpm's. [Greg Ames]

diff --git a/Makefile.in b/Makefile.in
index c1f8ef81610537f7a3579a534505a9fa0461f1e1..b5e3bc9ef95b24380aa1dfee2db06f4f18f8dc0b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,10 +17,10 @@ targets         = $(PROGRAMS) $(other_targets)
 phony_targets   = $(srcdir)/buildmark.c
 install_targets = install-conf install-htdocs install-icons install-other \
        install-cgi install-include install-support install-suexec
-DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
-       configure generated_lists include/ap_config_auto.h \
-       include/ap_config_auto.h.in include/ap_config_path.h install-sh \
-       missing mkinstalldirs
+DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \
+       modules.c libtool
+EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in \
+       generated_lists
 
 include $(top_srcdir)/build/rules.mk
 include $(top_srcdir)/build/program.mk

diff --git a/build/rules.mk b/build/rules.mk
index 9850782ec7c1e4691cf4fce97df3089b7ae5793a..e29bbe440b4ca8294f0b391e93ab43ce66f8e990 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -196,6 +196,9 @@ distclean: distclean-recursive clean-x
        rm -f config.cache config.log config.status config_vars.mk \
        stamp-h Makefile shlibtool .deps $(DISTCLEAN_TARGETS)
 
+extraclean: distclean
+       rm -f $(EXTRACLEAN_TARGETS)
+
 include $(builddir)/.deps
 
 .PHONY: all-recursive clean-recursive install-recursive \

diff --git a/server/Makefile.in b/server/Makefile.in
index 5aa02b4b33d6b5a0d6d86c0e68562d2e99a2720a..9e8242fd972eddccaf76ff789d67719768b7e8d5 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -2,6 +2,7 @@
 TARGET_EXPORTS    = apache.exports
 CLEAN_TARGETS = gen_test_char gen_uri_delims test_char.h uri_delims.h \
        $(TARGET_EXPORTS) ApacheCoreOS2.def
+EXTRACLEAN_TARGETS = exports.c
 
 SUBDIRS = mpm
 

diff --git a/support/Makefile.in b/support/Makefile.in
index ba1129824140af220d3eb416429b722bd8360d4c..ed1ffc9b70c74396afa9a30874326bf27d0e283b 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -1,4 +1,5 @@
-DISTCLEAN_TARGETS = apxs apachectl
+DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status logresolve.pl \
+       phf_abuse_log.cgi split-logfile
 
 PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
 targets  = $(PROGRAMS)