Minor changes to support parallel make: Eliminate for-loops for building

subdirectories; add explicit dependencies for subdirs that need them.

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
 

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
+$(SUBDIRS): FORCE
-	@echo "Making all in `$(PWD)`"
+	@echo "  Entering subdirectory $@"; cd $@; $(MAKE) $(MFLAGS) $(TARG); \
-	@for i in $(SUBDIRS) $(ALLDIRS); do 		\
+	echo ""
-		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
 
 Makefile: $(top_srcdir)/build/dir.mk

libraries/Makefile.in

@@ -5,3 +5,4 @@
 
 SUBDIRS= liblutil libldif liblber libldap libavl libldbm libldap_r
 
+libldap libldap_r: liblber