On Fri, Apr 06, 2001 at 01:41:51AM -0700, Greg Stein wrote:
> apr-util/xml/expat/ is ASF-managed. We should patch it whenever and however
> we like. I'll cross-sync ours with the real Expat. At some point, our needs
> will precisely coincide with the real Expat CVS repository (they don't
> *yet*) and we can completely dump our copy. But until they coincide, we'll
> simply keep a tweaked copy in our repository.
Okay, that's fine - I wasn't sure what the policy was.
> Enough with the black hole already. You mentioned this once before. We all
I didn't mean it as a slight towards anyone - just comical. Sorry for any
offense. I know you all are busy - I don't want to add to anyone's work
load here (especially this week). In fact, I was hoping that I would
lessen others' load by submitting these patches. Again, my apologies.
> The other day, I complained about Mike Abbott's "drive-by patching." Patches
> need a caretaker; dropping them on us and going away is invariably the wrong
> approach.
I don't intend to do that, but feedback (like this) is appreciated every
once in a while. Thanks - I'm not asking for much...
> We discussed using "extraclean" consistently, everywhere. Apache has a
> "cvsclean" target, IIRC. Roy may have tossed it, though. The extraclean
> target is used by quite a few other software packages.
cvsclean isn't there right now. I switched my patch to use extraclean.
> config.nice != config.status
>
> It should *not* be removed by a distclean. Very often, we will rebuild a
> "configure" and want to run it with the same options. config.status isn't
> correct since it corresponds to a different "configure". Thus, we have
> config.nice. And it needs to survive across a distclean.
I realized that - this is why I mentioned it. But, Apache 1.3.x does
delete the config.status file - although it is a different name, config.nice
in Apache 2.0 is equivalent (IMHO) to config.status. I thought I would
submit a patch that tries to follow what has been done before. But, yes,
I agree - config.nice should not be deleted.
> exports.c could go into the EXTRACLEAN_TARGETS because it could (should?) be
> distributed with the tarball. It isn't going to change from one
> configuration to the next, and it is portable
Done - as I said, I wasn't sure where it should go. I guess it needs to
be included with the tarball (it showed up on rse's diff).
> libtool needs to be removed from the EXTRACLEAN.
I knew something would slip by. =-) Thanks.
> The build/* files should NOT be in the top-level Makefile.in. build/ already
> has its own Makefile, with cleaning targets for a bunch of stuff.
I don't see the Makefile.in in the build directories. Am I missing
something?
Thanks. -- 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
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
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
