From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 24 Jul 1999 21:40:58 +0000 (+0000)
Subject: Back out paralyzing changes.
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;ds=sidebyside;h=b9764fff760c4100db9542a58997f99a24db352d;p=openldap

Back out paralyzing changes.
---

diff --git a/Makefile.in b/Makefile.in
index 39399a83c6..e055496662 100644
--- 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 3f1abbd073..dfc5742dc6 100644
--- 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 56bf0eb394..7ffb1b9bfa 100644
--- 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 86ea826f90..2e0aa85782 100644
--- 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)
+
+
+
+
+
+
+
+
+
+
+
+