From: Howard Chu <hyc@openldap.org>
Date: Sat, 24 Jul 1999 08:25:48 +0000 (+0000)
Subject: Minor changes to support parallel make: Eliminate for-loops for building
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~36
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=61d0ffd135b7f55b3037146442084d48ddbdd20d;p=openldap

Minor changes to support parallel make: Eliminate for-loops for building
subdirectories; add explicit dependencies for subdirs that need them.
---

diff --git a/Makefile.in b/Makefile.in
index e055496662..39399a83c6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,10 @@ SUBDIRS= include libraries clients servers tests doc
 CLEANDIRS= contrib
 INSTALLDIRS= 
 
+libraries: include
+clients servers: libraries
+tests: clients servers
+
 makefiles:	FORCE
 	./config.status
 
diff --git a/build/dir.mk b/build/dir.mk
index ebf4d813e7..3f1abbd073 100644
--- a/build/dir.mk
+++ b/build/dir.mk
@@ -6,45 +6,12 @@
 ## Makes subdirectories
 ##
 
+all-common install-common clean-common veryclean-common depend-common: FORCE
+	@T=`echo $@ | cut -d- -f1`; echo "Making $$T in `$(PWD)`"; \
+	 $(MAKE) $(MFLAGS) $(SUBDIRS) TARG=$$T
 
-all-common: FORCE
-	@echo "Making all in `$(PWD)`"
-	@for i in $(SUBDIRS) $(ALLDIRS); do 		\
-		echo "  Entering subdirectory $$i";		\
-		( cd $$i; $(MAKE) $(MFLAGS) all );		\
-		echo " ";								\
-	done
-
-install-common: FORCE
-	@echo "Making install in `$(PWD)`"
-	@for i in $(SUBDIRS) $(INSTALLDIRS); do 	\
-		echo "  Entering subdirectory $$i";		\
-		( cd $$i; $(MAKE) $(MFLAGS) install );	\
-		echo " ";								\
-	done
-
-clean-common: FORCE
-	@echo "Making clean in `$(PWD)`"
-	@for i in $(SUBDIRS) $(CLEANDIRS); do		\
-		echo "  Entering subdirectory $$i";		\
-		( cd $$i; $(MAKE) $(MFLAGS) clean );	\
-		echo " ";								\
-	done
-
-veryclean-common: FORCE
-	@echo "Making veryclean in `$(PWD)`"
-	@for i in $(SUBDIRS) $(CLEANDIRS); do		\
-		echo "  Entering subdirectory $$i";		\
-		( cd $$i; $(MAKE) $(MFLAGS) veryclean );	\
-		echo " ";								\
-	done
-
-depend-common: FORCE
-	@echo "Making depend in `$(PWD)`"
-	@for i in $(SUBDIRS) $(DEPENDDIRS); do		\
-		echo "  Entering subdirectory $$i";		\
-		( cd $$i; $(MAKE) $(MFLAGS) depend );	\
-		echo " ";								\
-	done
+$(SUBDIRS): FORCE
+	@echo "  Entering subdirectory $@"; cd $@; $(MAKE) $(MFLAGS) $(TARG); \
+	echo ""
 
 Makefile: $(top_srcdir)/build/dir.mk
diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index 7ffb1b9bfa..56bf0eb394 100644
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -5,3 +5,4 @@
 
 SUBDIRS= liblutil libldif liblber libldap libavl libldbm libldap_r
 
+libldap libldap_r: liblber