- add some missing distclean targets

- use DISTCLEAN_TARGETS and CLEAN_TARGETS everywhere (to be consistent
with other macros and with APR)
- warn that aclocal.m4 is a generated file

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

diff --git a/Makefile.in b/Makefile.in
index d29aaf4d041fad46515be31d0dd55628398cac36..1da5a0fbecad20c4add0c7107a22e045e21f29ff 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,9 +16,10 @@ targets         = $(PROGRAMS)
 phony_targets   = $(srcdir)/buildmark.c
 install_targets = install-conf install-htdocs install-icons install-other \
        install-cgi install-include install-support install-suexec
-DISTCLEANFILES  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
+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
+       include/ap_config_auto.h.in include/ap_config_path.h install-sh \
+       missing mkinstalldirs
 
 include $(top_srcdir)/build/rules.mk
 include $(top_srcdir)/build/program.mk

diff --git a/acinclude.m4 b/acinclude.m4
index b7c511c881fab2f4707eb6630c17e0ec56d49e69..5ff8066a589054c5de345e0f3bd7ecc62ab6ba19 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -214,6 +214,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[
 ])dnl
 dnl
 AC_DEFUN(APACHE_MODPATH_FINISH,[
+  echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
   echo "static = $modpath_static" >> $modpath_current/modules.mk
   echo "shared = $modpath_shared" >> $modpath_current/modules.mk
   if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then

diff --git a/build/build2.mk b/build/build2.mk
index eeb5bebc64d21d63ba32bd8e5a7da365fff0fe2d..1eb6e67750ea529a152205ab7549adbd54b4f92d 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -86,7 +86,9 @@ libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4
 
 aclocal.m4: acinclude.m4 srclib/apr/apr_common.m4 srclib/apr/hints.m4 $(libtool_m4)
        @echo rebuilding $@
-       @cat acinclude.m4 $(libtool_m4) > $@
+       @echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf" >$@
+       @echo "dnl edits here will be lost" >>$@
+       @cat acinclude.m4 $(libtool_m4) >> $@
 
 $(LT_TARGETS):
        libtoolize $(AMFLAGS) --force

diff --git a/build/rules.mk b/build/rules.mk
index f5284bfa67175a28ad3e4d9ff94b4387bb82b39b..26d4cfc0ff8e256129ffd520ddc50cc387873203 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -182,12 +182,12 @@ depend: depend-recursive
 clean: clean-recursive clean-x
 
 clean-x:
-       rm -f $(targets) *.slo *.lo *.la *.o $(CLEANFILES)
+       rm -f $(targets) *.slo *.lo *.la *.o $(CLEAN_TARGETS)
        rm -rf .libs
 
 distclean: distclean-recursive clean-x
        rm -f config.cache config.log config.status config_vars.mk libtool \
-       stamp-h Makefile shlibtool .deps $(DISTCLEANFILES)
+       stamp-h Makefile shlibtool .deps $(DISTCLEAN_TARGETS)
 
 include $(builddir)/.deps
 

diff --git a/server/Makefile.in b/server/Makefile.in
index 8e8180f4330c550921ceea351af7533e74781886..02cf73d917dd85c350d5370814324202c608be7d 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,6 +1,6 @@
 
 TARGET_EXPORTS    = apache.exports
-CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h \
+CLEAN_TARGETS = gen_test_char gen_uri_delims test_char.h uri_delims.h \
        $(TARGET_EXPORTS)
 
 SUBDIRS = mpm

diff --git a/srclib/pcre/Makefile.in b/srclib/pcre/Makefile.in
index ba2cd140ca9ec1f3b8d7ccd8248fbf172e3c4abd..3f30dc3f6201dec8804be42bdee2078e996ff116 100644 (file)
--- a/srclib/pcre/Makefile.in
+++ b/srclib/pcre/Makefile.in
@@ -1,8 +1,8 @@
 LTLIBRARY_NAME = libpcre.la
 LTLIBRARY_SOURCES = maketables.c get.c study.c pcre.c pcreposix.c
 
-CLEANFILES = dftables chartables.c
-DISTCLEANFILES = config.h $(CLEANFILES)
+CLEAN_TARGETS = dftables chartables.c
+DISTCLEAN_TARGETS = pcre.h pcre-config config.h $(CLEAN_TARGETS)
 
 include $(top_srcdir)/build/ltlib.mk
 

diff --git a/support/Makefile.in b/support/Makefile.in
index 473fdd2100b10023bae962bae8f9a3c359c31e4b..e51e5be98b1283fe3312c8320b6aac7afae1cc88 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -1,3 +1,4 @@
+DISTCLEAN_TARGETS = apxs apachectl
 
 PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
 targets  = $(PROGRAMS)