ITS5282 fix for 2.3

[openldap] / build / dir.mk

diff --git a/build/dir.mk b/build/dir.mk
index e78f0be0862f1b41afa38570e334b21ef7178175..039181c121def9ee1a317111cb94cdd556953b7c 100644 (file)
--- a/build/dir.mk
+++ b/build/dir.mk
@@ -1,48 +1,65 @@
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Makes subdirectories
+## Copyright 1998-2007 The OpenLDAP Foundation.
+## All rights reserved.
 ##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+##---------------------------------------------------------------------------
+#
+# 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