From: Howard Chu <hyc@openldap.org>
Date: Sat, 24 Jul 1999 09:21:34 +0000 (+0000)
Subject: Minor changes to support parallel make.
X-Git-Tag: OPENLDAP_REL_ENG_2_BP~35
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5692be1fe4809dcb921067a0bbcef46974187e2e;p=openldap

Minor changes to support parallel make.
---

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