X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fdir.mk;h=efda69262e90552b7dffd2a1c4525bcebcf4ed24;hb=b8788e8a758d47c1148a39de7533f626f3f4b861;hp=e78f0be0862f1b41afa38570e334b21ef7178175;hpb=319aa913162c0e16592b8b41d26adf4ba4a98176;p=openldap

diff --git a/build/dir.mk b/build/dir.mk
index e78f0be086..efda69262e 100644
--- a/build/dir.mk
+++ b/build/dir.mk
@@ -1,48 +1,56 @@
+# $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation
+## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+## of this package for details.
+##---------------------------------------------------------------------------
 ##
 ## Makes subdirectories
 ##
 
-all:	allsubs
-allsubs: FORCE
+
+all-common: FORCE
 	@echo "Making all in `$(PWD)`"
-	@for i in $(SUBDIRS); do 					\
+	@for i in $(SUBDIRS) $(ALLDIRS); do 		\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) all );		\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
-install:	installsubs
-installsubs: FORCE
+install-common: FORCE
 	@echo "Making install in `$(PWD)`"
-	@for i in $(SUBDIRS); do 					\
+	@for i in $(SUBDIRS) $(INSTALLDIRS); do 	\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) install );	\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
-clean:	cleansubs
-cleansubs: FORCE
+clean-common: FORCE
 	@echo "Making clean in `$(PWD)`"
-	@for i in $(SUBDIRS); do 					\
+	@for i in $(SUBDIRS) $(CLEANDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) clean );	\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
-veryclean: verysubs
-verysubs: FORCE
+veryclean-common: FORCE
 	@echo "Making veryclean in `$(PWD)`"
-	@for i in $(SUBDIRS); do 					\
+	@for i in $(SUBDIRS) $(CLEANDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) veryclean );	\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
 
-depend: dependsubs
-dependsubs: FORCE
+depend-common: FORCE
 	@echo "Making depend in `$(PWD)`"
-	@for i in $(SUBDIRS); do 					\
+	@for i in $(SUBDIRS) $(DEPENDDIRS); do		\
 		echo "  Entering subdirectory $$i";		\
 		( cd $$i; $(MAKE) $(MFLAGS) depend );	\
+		if test $$? != 0 ; then exit 1; fi ;	\
 		echo " ";								\
 	done
+
+Makefile: $(top_srcdir)/build/dir.mk