X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=b442e97cba65fdef441b4c3ebb1ef13f0ff5ce59;hb=008bbf56dbbe472cc0e95fb15e78c55e7e97e4c4;hp=9766a6d57ed05e1ec38946f14c6fe90e745381ed;hpb=334768c1bbb867f5a5a31d78f20152de5526c2ba;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 9766a6d57e..b442e97cba 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -8,24 +8,30 @@ 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 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 module.o suffixalias.o
 
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
-# $(LTHREAD_LIBS) must be last!
-XLIBS = libbackends.a $(SLAPD_LIBS) $(LDAP_LIBS) \
-	-lavl $(LDAP_LIBLDBM)
-XXLIBS = $(KRB_LIBS) $(LDAP_LIBLTHREAD)
+XDEFS = $(MODULES_CPPFLAGS)
+XLDFLAGS = $(MODULES_LDFLAGS)
+
+# $(LTHREAD_LIBS) must be last
+XLIBS = libbackends.a -lavl -lldbm -lldif -lldap_r -llber -llutil
+XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) \
+	$(PERL_LDFLAGS) $(KRB_LIBS) $(TLS_LIBS) $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
 
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
@@ -34,6 +40,7 @@ all-local-srv: FORCE
 	$(MAKE) $(MFLAGS) backendslib
 	$(MAKE) $(MFLAGS) slapd
 	(cd tools; $(MAKE) $(MFLAGS) all)
+	$(MAKE) $(MFLAGS) all-cffiles
 
 slapd: version.o
 	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
@@ -74,18 +81,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 \
@@ -102,6 +100,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
 
@@ -112,23 +119,46 @@ install-slapd: FORCE
 
 CFFILES=slapd.conf slapd.at.conf slapd.oc.conf
 
+all-cffiles:
+	@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.$$ ; \
-		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $(srcdir)/$$i > $$tmpcf ; \
+		tmpcf=$$i.tmp ; \
+		if test $$i = slapd.conf ; then \
+			mode=600 ; \
+		else \
+			mode=644 ; \
+		fi ; \
 		if test ! -f $(sysconfdir)/$$i; then \
 			echo "installing $$i in $(sysconfdir)"; \
-			echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i"; \
-			$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i; \
+			echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i"; \
+			$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i; \
 		else \
 			echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
 		fi; \
-		$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i.default; \
-		$(RM) -f $$tmpcf ; \
+		$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i.default ; \
 	done
 
 install-tools: FORCE
 	@-$(MKDIR) $(sbindir)
 	(cd tools; $(MAKE) $(MFLAGS) install)
 
+
+
+
+
+
+
+
+
+
+
+