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

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 5f058307ac..05744d04ca 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -8,49 +8,54 @@ 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 \
 		dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
 		value.c ava.c bind.c unbind.c abandon.c filterentry.c \
-		phonetic.c acl.c str2filter.c aclparse.c init.c \
-		repl.c lock.c \
-		suffixalias.c schema.c schemaparse.c monitor.c configinfo.c
+		phonetic.c acl.c str2filter.c aclparse.c init.c user.c \
+		repl.c lock.c controls.c extended.c \
+		schema.c schemaparse.c monitor.c configinfo.c \
+		root_dse.c sasl.c module.c suffixalias.c
 OBJS	= main.o daemon.o connection.o search.o filter.o add.o charray.o \
 		attr.o entry.o config.o backend.o result.o operation.o \
 		dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \
 		value.o ava.o bind.o unbind.o abandon.o filterentry.o \
-		phonetic.o acl.o str2filter.o aclparse.o init.o \
-		repl.o lock.o \
-		suffixalias.o schema.o schemaparse.o monitor.o configinfo.o
+		phonetic.o acl.o str2filter.o aclparse.o init.o user.o \
+		repl.o lock.o controls.o extended.o \
+		schema.o schemaparse.o monitor.o configinfo.o \
+		root_dse.o sasl.o module.o suffixalias.o
 
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
+SLAP_DIR=
+SLAPD_MODULES=@SLAPD_MODULES_LIST@
+XDEFS = $(MODULES_CPPFLAGS)
+XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
+
 # $(LTHREAD_LIBS) must be last
-XLIBS = libbackends.a -lavl -lldbm -lldif -lldap -llber -llthread -llutil
+XLIBS = libbackends.a -lavl -lldbm -lldif -lldap_r -llber -llutil
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) \
-	$(PERL_LDFLAGS) $(KRB_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(LTHREAD_LIBS)
+	$(PERL_LDFLAGS) $(SECURITY_LIBS) \
+	$(LDIF_LIBS) $(LUTIL_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)
+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
@@ -75,18 +80,9 @@ libbackends.a: .backend
 	fi
 	@ls -l libbackends.a
 
-version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
-		$(LDAP_LIBDIR)/libldbm.a \
-		$(LDAP_LIBDIR)/libavl.a \
-		$(LDAP_LIBDIR)/libldif.a \
-		$(LDAP_LIBDIR)/liblutil.a \
-		$(LDAP_LIBDIR)/liblthread.a 
-	$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Version.c > $@)
+version.c: libbackends.a $(OBJS) $(SLAPD_LIBDEPEND) 
+	@-$(RM) $@
+	$(MKVERSION) -s -n Versionstr slapd > $@
 
 depend-local-srv: FORCE
 	@for i in back-* shell-backends tools; do \
@@ -103,6 +99,15 @@ clean-local-srv: FORCE
 			( cd $$i; $(MAKE) $(MFLAGS) clean ); \
 		fi; \
 	done
+	rm -f *.tmp all-cffiles
+
+veryclean-local-srv: FORCE
+	@for i in back-* shell-backends tools; do \
+		if [ -d $$i ]; then \
+			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
+			( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
+		fi; \
+	done
 
 install-local-srv: install-slapd install-conf install-tools
 
@@ -110,19 +115,36 @@ 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: slapd
+	@for i in $(CFFILES); do \
+		tmpcf=$$i.tmp; \
+		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \
+			-e 's;%LOCALSTATEDIR%;$(localstatedir);' \
+			$(srcdir)/$$i > $$tmpcf ; \
+	done
+	touch all-cffiles
+
 install-conf: FORCE
 	@-$(MKDIR) $(sysconfdir)
 	@for i in $(CFFILES); do \
-		tmpcf=/tmp/$$i.$$ ; \
+		tmpcf=$$i.tmp ; \
 		if test $$i = slapd.conf ; then \
 			mode=600 ; \
 		else \
 			mode=644 ; \
 		fi ; \
-		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $(srcdir)/$$i > $$tmpcf ; \
 		if test ! -f $(sysconfdir)/$$i; then \
 			echo "installing $$i in $(sysconfdir)"; \
 			echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i"; \
@@ -131,7 +153,6 @@ install-conf: FORCE
 			echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
 		fi; \
 		$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i.default ; \
-		$(RM) -f $$tmpcf ; \
 	done
 
 install-tools: FORCE