fielding 01/05/03 19:39:44
Modified: . CHANGES
build Makefile.in rules.mk.in
Log:
Only make test recursively for the *clean targets.
Revision Changes Path
1.102 +2 -1 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- CHANGES 2001/05/03 22:37:54 1.101
+++ CHANGES 2001/05/04 02:39:43 1.102
@@ -7,7 +7,8 @@
Use set_h_errno() instead. PR #7651 [Jeff Trawick]
*) Add the test and build directories (when present) to the recursive
- make process, being sure that they are run last. [Roy Fielding]
+ make process, being sure that they are run last. test is only done
+ recursively for make *clean targets. [Roy Fielding]
*) Make the apr_mmap_create() function use the native_flags variable.
This allows us to actually create WRITEABLE MMAPs.
1.2 +3 -0 apr/build/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/build/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 2001/05/01 04:52:02 1.1
+++ Makefile.in 2001/05/04 02:39:44 1.2
@@ -5,4 +5,7 @@
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
+x-local-all x-local-depend x-local-clean:
+ @echo "Congratulations -- make has successfully completed"
+
# DO NOT REMOVE
1.13 +8 -6 apr/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr/build/rules.mk.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rules.mk.in 2001/05/01 05:54:21 1.12
+++ rules.mk.in 2001/05/04 02:39:44 1.13
@@ -156,13 +156,15 @@
if test -z "$$made_local"; then \
$(MAKE) "local-$$otarget" || exit 1; \
fi; \
- if test -d "test"; then \
- echo "Making $$target in test"; \
- (cd test && $(MAKE) local-$$target) || exit 1; \
- fi; \
+ case $$otarget in *clean) \
+ if test -d "test"; then \
+ echo "Making local-$$otarget in test"; \
+ (cd test && $(MAKE) local-$$otarget) || exit 1; \
+ fi ;; \
+ esac; \
if test -d "build"; then \
- echo "Making $$target in build"; \
- (cd build && $(MAKE) local-$$target) || exit 1; \
+ echo "Making local-$$otarget in build"; \
+ (cd build && $(MAKE) local-$$otarget) || exit 1; \
fi
local-clean: x-local-clean