You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fi...@apache.org on 2001/05/01 06:52:04 UTC
cvs commit: apr/build Makefile.in rules.mk.in
fielding 01/04/30 21:52:03
Modified: . CHANGES Makefile.in configure.in
build rules.mk.in
Added: build Makefile.in
Log:
Add the test and build directories (when present) to the recursive
make process, being sure that they are run last. This may not be a
good idea if the test programs are not as portable as APR itself.
Revision Changes Path
1.99 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- CHANGES 2001/04/30 00:07:34 1.98
+++ CHANGES 2001/05/01 04:51:59 1.99
@@ -1,5 +1,8 @@
Changes with APR b1
+ *) Add the test and build directories (when present) to the recursive
+ make process, being sure that they are run last. [Roy Fielding]
+
*) Make the apr_mmap_create() function use the native_flags variable.
This allows us to actually create WRITEABLE MMAPs.
[Ed Korthof <ed...@apache.org>]
1.49 +1 -1 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile.in 2001/04/11 06:16:33 1.48
+++ Makefile.in 2001/05/01 04:52:00 1.49
@@ -29,7 +29,7 @@
CLEAN_TARGETS = $(TARGET_EXPORTS)
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
- APRVARS libtool build/rules.mk
+ APRVARS libtool
EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in
SCANDOC_TEMPLATE = -i$(apr_builders)/scandoc_template.pl
1.297 +1 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- configure.in 2001/05/01 02:17:16 1.296
+++ configure.in 2001/05/01 04:52:00 1.297
@@ -1114,7 +1114,7 @@
AC_SUBST(LIBTOOL_LIBS)
echo "${nl}Construct Makefiles and header files."
-MAKEFILE1="Makefile lib/Makefile strings/Makefile passwd/Makefile tables/Makefile"
+MAKEFILE1="Makefile lib/Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile"
SUBDIRS="lib strings passwd tables "
for dir in $apr_modules
do
1.11 +15 -6 apr/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr/build/rules.mk.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rules.mk.in 2001/04/29 05:22:15 1.10
+++ rules.mk.in 2001/05/01 04:52:03 1.11
@@ -155,6 +155,14 @@
fi; \
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; \
+ if test -d "build"; then \
+ echo "Making $$target in build"; \
+ (cd build && $(MAKE) local-$$target) || exit 1; \
fi
local-clean: x-local-clean
@@ -164,24 +172,24 @@
local-distclean: local-clean x-local-distclean
$(RM) -f Makefile $(DISTCLEAN_TARGETS)
-local-extraclean: local-distclean
+local-extraclean: local-distclean x-local-extraclean
@if test -n "$(EXTRACLEAN_TARGETS)"; then \
echo $(RM) -f $(EXTRACLEAN_TARGETS) ; \
$(RM) -f $(EXTRACLEAN_TARGETS) ; \
fi
-local-all: $(TARGETS)
+local-all: $(TARGETS) x-local-all
-local-depend:
+local-depend: x-local-depend
@if test -n "`ls *.c 2> /dev/null`"; then \
echo $(MKDEP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) *.c ; \
$(MKDEP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) *.c ; \
fi
# to be filled in by the actual Makefile
-x-local-clean x-local-distclean:
+x-local-all x-local-depend:
+x-local-clean x-local-distclean x-local-extraclean:
-
#
# Implicit rules for creating outputs from input files
#
@@ -198,4 +206,5 @@
all-recursive depend-recursive clean-recursive distclean-recursive \
extraclean-recursive
local-all local-depend local-clean local-distclean local-extraclean \
- x-local-clean x-local-distclean
+ x-local-all x-local-depend x-local-clean x-local-distclean \
+ x-local-extraclean
1.1 apr/build/Makefile.in
Index: Makefile.in
===================================================================
TARGETS=
INCLUDES=
DISTCLEAN_TARGETS = rules.mk
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
# DO NOT REMOVE