X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=05744d04cad145895dba9de03dee5e776d7dcebe;hb=56bbc0b4860c716b4a21f98c2f0eba9a7a70b765;hp=70025e4477b98068dbd69426828e41fc86aafd9b;hpb=e0691dfbc07d0b2a0e6bec528b33802ed04f5960;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 70025e4477..05744d04ca 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -24,40 +24,38 @@ OBJS	= main.o daemon.o connection.o search.o filter.o add.o charray.o \
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
+SLAP_DIR=
+SLAPD_MODULES=@SLAPD_MODULES_LIST@
 XDEFS = $(MODULES_CPPFLAGS)
-XLDFLAGS = $(MODULES_LDFLAGS)
+XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
 
 # $(LTHREAD_LIBS) must be last
 XLIBS = libbackends.a -lavl -lldbm -lldif -lldap_r -llber -llutil
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) \
 	$(PERL_LDFLAGS) $(SECURITY_LIBS) \
 	$(LDIF_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(LTHREAD_LIBS)
+XXXLIBS = $(LTHREAD_LIBS) $(MODULES_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
+all-local-srv: all-cffiles
 
-slapd: version.o
+slapd: libbackends.a version.o
 	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
+	(cd tools; $(MAKE) $(MFLAGS) all)
 
 sslapd: version.o
 	$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
 
-backendslib:	FORCE
+.backend: 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
+	echo " "
 
 libbackends.a: .backend
 	@$(RM) -r tmp
@@ -117,10 +115,19 @@ install-slapd: FORCE
 	@-$(MKDIR) $(libexecdir)
 	@-$(MKDIR) $(localstatedir)
 	$(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir)
+	@if [ ! -z "$(SLAPD_MODULES)" ]; then \
+	    for i in back-* shell-backends tools; do \
+		if [ -d $$i ]; then \
+			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
+			( cd $$i; $(MAKE) $(MFLAGS) install ); \
+		fi; \
+	    done; \
+	fi
+
 
 CFFILES=slapd.conf slapd.at.conf slapd.oc.conf
 
-all-cffiles:
+all-cffiles: slapd
 	@for i in $(CFFILES); do \
 		tmpcf=$$i.tmp; \
 		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \
@@ -152,14 +159,3 @@ install-tools: FORCE
 	@-$(MKDIR) $(sbindir)
 	(cd tools; $(MAKE) $(MFLAGS) install)
 
-
-
-
-
-
-
-
-
-
-
-