rbb 01/01/18 15:28:32
Modified: . Makefile.in
build rules.mk.in
Log:
Fix the apr-util build rules, so that we do not build the test or build
directories, but they are still cleaned.
Revision Changes Path
1.19 +4 -3 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.in 2001/01/18 04:34:43 1.18
+++ Makefile.in 2001/01/18 23:28:30 1.19
@@ -10,7 +10,8 @@
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
-SUBDIRS = buckets crypto dbm encoding hooks uri xml . test build
+SUBDIRS = buckets crypto dbm encoding hooks uri xml
+CLEAN_SUBDIRS = . test build
CLEAN_TARGETS = $(TARGET_EXPORTS)
DISTCLEAN_TARGETS = config.cache config.log config.status \
@@ -24,7 +25,7 @@
delete-lib:
@if test -f $(TARGET_LIB); then \
- objects="`find . -name '*.lo' -a -newer $(TARGET_LIB)`" ; \
+ objects="`find $(SUBDIRS) -name '*.lo' -a -newer $(TARGET_LIB)`" ; \
if test -n "$$objects"; then \
echo Found newer objects. Will relink $(TARGET_LIB). ; \
echo $(RM) -f $(TARGET_LIB) ; \
@@ -33,7 +34,7 @@
fi
$(TARGET_LIB):
- @objects="`find . -name '*.lo'`" ; \
+ @objects="`find $(SUBDIRS) -name '*.lo'`" ; \
echo $(LINK) $$objects ; \
$(LINK) -rpath $(libdir) $$objects
1.7 +4 -0 apr-util/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr-util/build/rules.mk.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rules.mk.in 2001/01/07 00:27:28 1.6
+++ rules.mk.in 2001/01/18 23:28:31 1.7
@@ -100,6 +100,10 @@
extraclean-recursive:
@otarget=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; \
+ ttarget=`echo $otarget | sed s/.*clean.*/clean/`; \
+ if test x"$ttarget" = "xclean"; then \
+ list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \
+ fi; \
for i in $$list; do \
if test -d "$$i"; then \
target="$$otarget"; \
