Back out paralyzing changes.

diff --git a/Makefile.in b/Makefile.in
index 39399a83c6023f16a9d40e10b8a81866631fa87b..e0554966622c38627bca91c64b4784c9f1902c7b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,10 +13,6 @@ 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 3f1abbd0735b7e80c743ab63b5e013c04bfe4766..dfc5742dc6844af98eb521e8779cdefc9418b698 100644 (file)
--- a/build/dir.mk
+++ b/build/dir.mk
@@ -7,11 +7,12 @@
 ##
 
 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
-
-$(SUBDIRS): FORCE
-       @echo "  Entering subdirectory $@"; cd $@; $(MAKE) $(MFLAGS) $(TARG); \
-       echo ""
+       @t=`echo $@ | cut -d- -f1`; \
+       echo "Making $$t in `$(PWD)`"; \
+       for i in $(SUBDIRS); do \
+               echo "  Entering subdirectory $$i to execute:"; \
+               echo "    $(MAKE) $(MFLAGS) $$t"; \
+               ( cd $$i; $(MAKE) $(MFLAGS) $$t ); \
+       done
 
 Makefile: $(top_srcdir)/build/dir.mk

diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index 56bf0eb39468c6d4c70eb2371429bef5f203ba90..7ffb1b9bfa7482cf641415865f7060632a9de71b 100644 (file)
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -5,4 +5,3 @@
 
 SUBDIRS= liblutil libldif liblber libldap libavl libldbm libldap_r
 
-libldap libldap_r: liblber

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 86ea826f9004e64044eabe5059ca9fc23a4ecf99..2e0aa857827306750759eb289e4c7aeba7dc48e7 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -36,27 +36,29 @@ XXXLIBS = $(LTHREAD_LIBS)
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
-BACKENDS=back-*
+all-local-srv: FORCE
+       $(MAKE) $(MFLAGS) backendslib
+       $(MAKE) $(MFLAGS) slapd
+       (cd tools; $(MAKE) $(MFLAGS) all)
+       $(MAKE) $(MFLAGS) all-cffiles
 
-all-local-srv: slapd all-cffiles tools
-
-tools: libbackends.a
-
-slapd: version.o libbackends.a
+slapd: version.o
        $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
 
-sslapd: version.o libbackends.a
+sslapd: version.o
        $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
 
-$(BACKENDS) tools:     FORCE
-       @ if [ -d $@ ]; then \
-               echo " "; echo "  cd $@; $(MAKE) $(MFLAGS) all"; \
-               cd $@; $(MAKE) $(MFLAGS) all ; \
-       fi
-
-.backend:
+backendslib:   FORCE
+       @for i in back-*; do \
+               if [ -d $$i ]; then \
+                       echo " "; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
+                       ( cd $$i; $(MAKE) $(MFLAGS) all ); \
+               fi; \
+       done; \
+       echo " "; \
+       $(MAKE) $(MFLAGS) libbackends.a
 
-libbackends.a: .backend $(BACKENDS)
+libbackends.a: .backend
        @$(RM) -r tmp
        @$(MKDIR) tmp
        @-for i in back-*/*.a; do \
@@ -148,3 +150,15 @@ install-conf: FORCE
 install-tools: FORCE
        @-$(MKDIR) $(sbindir)
        (cd tools; $(MAKE) $(MFLAGS) install)
+
+
+
+
+
+
+
+
+
+
+
+