Allow us to build APR before APR-util, but clean APR-util before

APR.  This should fix the build for BeOS.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90850 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/rules.mk.in b/build/rules.mk.in
index 3cd53f8ffa89b26a4d29fe3b826b8dbc94990faa..29dd2deb90e7a46d75d7b924a69a78b115b60579 100644 (file)
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -107,7 +107,7 @@ shared-build: shared-build-recursive
 
 all-recursive install-recursive depend-recursive:
        @otarget=`echo $@|sed s/-recursive//`; \
-       list='$(SUBDIRS)'; \
+       list=' $(BUILD_SUBDIRS) $(SUBDIRS)'; \
        for i in $$list; do \
            if test -d "$$i"; then \
                target="$$otarget"; \
@@ -128,7 +128,7 @@ all-recursive install-recursive depend-recursive:
 
 clean-recursive distclean-recursive extraclean-recursive:
        @otarget=`echo $@|sed s/-recursive//`; \
-       list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \
+       list='$(CLEAN_SUBDIRS) $(SUBDIRS)'; \
        for i in $$list; do \
            if test -d "$$i"; then \
                target="$$otarget"; \

diff --git a/srclib/Makefile.in b/srclib/Makefile.in
index 509afd1179b16f00a7bcfe69e63a4e8f05ea167a..cfa33a69edf459a07da16d59759f13b1dfc12289 100644 (file)
--- a/srclib/Makefile.in
+++ b/srclib/Makefile.in
@@ -1,4 +1,6 @@
 
-SUBDIRS = apr apr-util $(AP_LIB_DIRS) pcre
+SUBDIRS = $(AP_LIB_DIRS) pcre
+BUILD_SUBDIRS = apr apr-util
+CLEAN_SUBDIRS = apr-util apr
 
 include $(top_srcdir)/build/rules.mk