From: Howard Chu <hyc@openldap.org>
Date: Mon, 9 Aug 1999 01:29:27 +0000 (+0000)
Subject: Fix explicit backend dependencies. Wildcard was unreliable.
X-Git-Tag: TWEB_OL_BASE~244
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=638f37743b33234c43e8b5172e762aa38fd275b7;p=openldap

Fix explicit backend dependencies. Wildcard was unreliable.
---

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index ebb21afeeb..98c2a6c253 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -2,7 +2,7 @@
 ## Makefile.in for slapd
 ##
 PROGRAMS=slapd
-XPROGRAMS=sslapd libbackends.a
+XPROGRAMS=sslapd libbackends.a .backend
 XSRCS=version.c
 SRCS	= main.c daemon.c connection.c search.c filter.c add.c charray.c \
 		attr.c entry.c config.c backend.c result.c operation.c \
@@ -39,7 +39,7 @@ XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS)
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
-all-local-srv: all-cffiles
+all-local-srv: backendslib all-cffiles
 
 slapd: libbackends.a version.o
 	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
@@ -48,10 +48,7 @@ slapd: libbackends.a version.o
 sslapd: version.o
 	$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
 
-# dummy equivalent of FORCE when wildcard fails
-back-*/libback*.a:
-
-libbackends.a: back-*/libback*.a
+backendslib: FORCE
 	@for i in back-*; do \
 		if [ -d $$i ]; then \
 			echo " "; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
@@ -59,6 +56,10 @@ libbackends.a: back-*/libback*.a
 		fi; \
 	done; \
 	echo " "
+
+.backend: 
+
+libbackends.a: .backend
 	@$(RM) -r tmp
 	@$(MKDIR) tmp
 	@-for i in back-*/*.a; do \
diff --git a/servers/slapd/back-bdb2/Makefile.in b/servers/slapd/back-bdb2/Makefile.in
index cd725400d0..97ce09b7ae 100644
--- a/servers/slapd/back-bdb2/Makefile.in
+++ b/servers/slapd/back-bdb2/Makefile.in
@@ -22,3 +22,8 @@ XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
+all-local-lib:	../.backend
+
+../.backend: lib$(LIBBASE).a
+	@touch $@
+
diff --git a/servers/slapd/back-ldap/Makefile.in b/servers/slapd/back-ldap/Makefile.in
index bf7f479a18..208c16785f 100644
--- a/servers/slapd/back-ldap/Makefile.in
+++ b/servers/slapd/back-ldap/Makefile.in
@@ -16,3 +16,8 @@ XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
+all-local-lib:	../.backend
+
+../.backend: lib$(LIBBASE).a
+	@touch $@
+
diff --git a/servers/slapd/back-ldbm/Makefile.in b/servers/slapd/back-ldbm/Makefile.in
index 0ca8bd7edc..80c2fad6f8 100644
--- a/servers/slapd/back-ldbm/Makefile.in
+++ b/servers/slapd/back-ldbm/Makefile.in
@@ -20,3 +20,8 @@ XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
+all-local-lib:	../.backend
+
+../.backend: lib$(LIBBASE).a
+	@touch $@
+
diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in
index 5427f1900f..cc329172e7 100644
--- a/servers/slapd/back-passwd/Makefile.in
+++ b/servers/slapd/back-passwd/Makefile.in
@@ -14,3 +14,8 @@ XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
+all-local-lib:	../.backend
+
+../.backend: lib$(LIBBASE).a
+	@touch $@
+
diff --git a/servers/slapd/back-perl/Makefile.in b/servers/slapd/back-perl/Makefile.in
index 103f863f26..ac304be956 100644
--- a/servers/slapd/back-perl/Makefile.in
+++ b/servers/slapd/back-perl/Makefile.in
@@ -27,3 +27,8 @@ XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(PERL_CPPFLAGS) $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
+all-local-lib:	../.backend
+
+../.backend: lib$(LIBBASE).a
+	@touch $@
+
diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in
index 3878d0f339..a84238bd12 100644
--- a/servers/slapd/back-shell/Makefile.in
+++ b/servers/slapd/back-shell/Makefile.in
@@ -16,3 +16,8 @@ XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
+all-local-lib:	../.backend
+
+../.backend: lib$(LIBBASE).a
+	@touch $@
+
diff --git a/servers/slapd/back-tcl/Makefile.in b/servers/slapd/back-tcl/Makefile.in
index 62d4fc9a47..48de791460 100644
--- a/servers/slapd/back-tcl/Makefile.in
+++ b/servers/slapd/back-tcl/Makefile.in
@@ -29,3 +29,8 @@ XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 XINCPATH = -I.. -I$(srcdir)/..
 
+all-local-lib:	../.backend
+
+../.backend: lib$(LIBBASE).a
+	@touch $@
+