From: Roy T. Fielding <fielding@apache.org>
Date: Wed, 11 Apr 2001 06:44:07 +0000 (+0000)
Subject: Make clean, distclean, and extraclean consistently according to the
X-Git-Tag: 2.0.17~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd42bd8a4cf68797b44603cb244ac8c9fe82406;p=thirdparty%2Fapache%2Fhttpd.git

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 e20fb8c6e9f..80c161fb5ff 100644
--- 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 c1f8ef81610..b5e3bc9ef95 100644
--- 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 9850782ec7c..e29bbe440b4 100644
--- 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 5aa02b4b33d..9e8242fd972 100644
--- 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 ba112982414..ed1ffc9b70c 100644
--- 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)