Now that the dust from ApacheCon has settled a bit, any further comments on
the following patches for updating the distclean targets?
The following patches are attached:
httpd-distclean.patch
apr-distclean.patch
apr-util-distclean.patch
expat-distclean.patch
Since I am unaware of the policy for multiple patch submission,
I'm attaching. If that isn't the accepted policy, let me know and
I'll follow whatever the desired format is.
My original patches (posted last week) had a trailing space on one
of the lines in httpd-2.0/Makefile.in. It's removed here. -- justin
Index: Makefile.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/Makefile.in,v
retrieving revision 1.64
diff -u -r1.64 Makefile.in
--- Makefile.in 2001/04/03 17:03:35 1.64
+++ Makefile.in 2001/04/06 02:50:55
@@ -17,10 +17,10 @@
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 config.nice
+EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in \
+ generated_lists
include $(top_srcdir)/build/rules.mk
include $(top_srcdir)/build/program.mk
Index: build/rules.mk
===================================================================
RCS file: /home/cvspublic/httpd-2.0/build/rules.mk,v
retrieving revision 1.47
diff -u -r1.47 rules.mk
--- build/rules.mk 2001/04/03 00:29:42 1.47
+++ build/rules.mk 2001/04/06 02:50:56
@@ -196,6 +196,9 @@
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 \
Index: server/Makefile.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/Makefile.in,v
retrieving revision 1.39
diff -u -r1.39 Makefile.in
--- server/Makefile.in 2001/04/02 15:20:45 1.39
+++ server/Makefile.in 2001/04/06 02:50:56
@@ -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
Index: support/Makefile.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/support/Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 Makefile.in
--- support/Makefile.in 2001/01/10 01:04:53 1.12
+++ support/Makefile.in 2001/04/06 02:50:56
@@ -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)
Index: srclib/apr/Makefile.in
===================================================================
RCS file: /home/cvspublic/apr/Makefile.in,v
retrieving revision 1.45
diff -u -r1.45 Makefile.in
--- srclib/apr/Makefile.in 2001/04/05 03:59:29 1.45
+++ srclib/apr/Makefile.in 2001/04/06 14:49:43
@@ -29,9 +29,8 @@
CLEAN_TARGETS = $(TARGET_EXPORTS)
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
- APRVARS
-EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \
- include/arch/unix/apr_private.h.in
+ APRVARS libtool build/rules.mk
+EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in
SCANDOC_TEMPLATE = -i$(apr_builders)/scandoc_template.pl
Index: srclib/apr-util/Makefile.in
===================================================================
RCS file: /home/cvspublic/apr-util/Makefile.in,v
retrieving revision 1.26
diff -u -r1.26 Makefile.in
--- srclib/apr-util/Makefile.in 2001/04/05 04:00:10 1.26
+++ srclib/apr-util/Makefile.in 2001/04/06 14:54:11
@@ -16,9 +16,9 @@
CLEAN_TARGETS = $(TARGET_EXPORTS)
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/private/apu_config.h include/private/apu_private.h \
- include/apu.h export_vars.sh
-EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \
- include/private/apu_config.h.in
+ include/private/apu_select_dbm.h include/apu.h export_vars.sh \
+ libtool build/Makefile build/rules.mk
+EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in
prefix=@prefix@
exec_prefix=@exec_prefix@
Index: Makefile.in
===================================================================
RCS file: /home/cvspublic/apr-util/xml/expat/Makefile.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in
--- Makefile.in 2001/03/13 11:09:16 1.3
+++ Makefile.in 2001/04/06 14:57:21
@@ -121,7 +121,7 @@
@list='$(SUBDIRS)'; for dir in $$list; do \
cd $$dir; $(MAKE) distclean; cd ..; \
done
- rm -f config.h config.status config.log libtool examples/Makefile
xmlwf/Makefile
+ rm -f config.h config.status config.log libtool examples/Makefile
+xmlwf/Makefile Makefile
maintainer-clean: distclean
rm -f $(DISTRIBUTION)
Index: lib/Makefile.in
===================================================================
RCS file: /home/cvspublic/apr-util/xml/expat/lib/Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.in
--- lib/Makefile.in 2001/03/09 23:02:36 1.2
+++ lib/Makefile.in 2001/04/06 14:57:21
@@ -127,7 +127,7 @@
rm -rf .libs _libs
distclean: clean
- rm -f Makefile
+ rm -f Makefile expat.h
maintainer-clean: distclean
