trawick 2003/04/30 10:28:26
Modified: . Makefile.in
build .cvsignore Makefile.in
test Makefile.in
Log:
fix some problems with undesired build droppings left around after
"make [foo]clean"
for make clean:
zap all test programs, not just the ones we run from "make check"
for make distclean:
zap exports.c, export_vars.h instead of waiting for extraclean
zap apr_rules.mk... fix the old rules.mk references that weren't
changed when the file was renamed to rules.mk
for make extraclen:
zap ltmain.sh and libtool.m4
Revision Changes Path
1.87 +2 -3 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Makefile.in 4 Feb 2003 20:56:15 -0000 1.86
+++ Makefile.in 30 Apr 2003 17:28:25 -0000 1.87
@@ -34,9 +34,8 @@
CLEAN_TARGETS =
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
- libtool apr.exp apr-config
-EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in
\
- exports.c export_vars.h
+ libtool apr.exp apr-config exports.c export_vars.h
+EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
1.10 +0 -1 apr/build/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/build/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 4 Feb 2003 20:56:16 -0000 1.9
+++ .cvsignore 30 Apr 2003 17:28:26 -0000 1.10
@@ -3,7 +3,6 @@
ltconfig
ltmain.sh
ltcf-c.sh
-rules.mk
apr_rules.mk
LibD
LibR
1.6 +2 -2 apr/build/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/build/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 8 Dec 2002 17:16:25 -0000 1.5
+++ Makefile.in 30 Apr 2003 17:28:26 -0000 1.6
@@ -3,8 +3,8 @@
TARGETS=
INCLUDES=
-DISTCLEAN_TARGETS = rules.mk
-EXTRACLEAN_TARGETS = ltcf-c.sh
+DISTCLEAN_TARGETS = apr_rules.mk
+EXTRACLEAN_TARGETS = ltcf-c.sh ltmain.sh libtool.m4
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
1.136 +22 -11 apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- Makefile.in 18 Apr 2003 18:09:22 -0000 1.135
+++ Makefile.in 30 Apr 2003 17:28:26 -0000 1.136
@@ -1,12 +1,16 @@
srcdir = @srcdir@
VPATH = @srcdir@
-NONPORTABLE = \
- [EMAIL PROTECTED]@ \
- [EMAIL PROTECTED]@ \
- [EMAIL PROTECTED]@
+# PROGRAMS includes all test programs built on this platform.
+# STDTEST_PORTABLE
+# test programs invoked via standard user interface, run on all platforms
+# STDTEST_NONPORTABLE
+# test programs invoked via standard user interface, not portable
+# OTHER_PROGRAMS
+# programs such as sendfile, that have to be invoked in a special sequence
+# or with special parameters
-PROGRAMS = \
+STDTEST_PORTABLE = \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
@@ -16,25 +20,32 @@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
+STDTEST_NONPORTABLE = \
+ [EMAIL PROTECTED]@ \
+ [EMAIL PROTECTED]@ \
+ [EMAIL PROTECTED]@
+
+OTHER_PROGRAMS = [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ \
+ [EMAIL PROTECTED]@
+
+PROGRAMS = $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS)
-TARGETS = $(PROGRAMS) $(NONPORTABLE) [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ \
- [EMAIL PROTECTED]@
+TARGETS = $(PROGRAMS)
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
LOCAL_LIBS=../[EMAIL PROTECTED]@.la
-CLEAN_TARGETS = testfile.tmp mod_test.slo [EMAIL PROTECTED]@ [EMAIL
PROTECTED]@ \
- [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@
+CLEAN_TARGETS = testfile.tmp mod_test.slo [EMAIL PROTECTED]@ [EMAIL
PROTECTED]@
INCDIR=../include
INCLUDES=-I$(INCDIR)
CFLAGS=$(MY_CFLAGS)
-check: $(PROGRAMS) $(NONPORTABLE)
- for prog in $(PROGRAMS) $(NONPORTABLE); do \
+check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+ for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
./$$prog; \
if test $$? = 255; then \
echo "$$prog failed"; \
