X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=059c8f2b18d4cee9858724b37c686d72cad7e3f0;hb=92507af85cd3a9ae5cbb23074928734d643b3f70;hp=f7b4d910204104dce3d8d6791c51c6703f530d80;hpb=6f0bc8c99713a64c6b65de9b8cd1e30c014b370f;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index f7b4d91020..059c8f2b18 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -2,7 +2,8 @@
 ## Makefile.in for slapd
 ##
 PROGRAMS=slapd
-XPROGRAMS=libbackends.a .backend
+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 \
 		dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
@@ -24,16 +25,20 @@ LDAP_LIBDIR= ../../libraries
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
-all-local: FORCE
+all-local-srv: FORCE
 	$(MAKE) $(MFLAGS) backendslib
 	$(MAKE) $(MFLAGS) slapd
 	(cd tools; $(MAKE) $(MFLAGS) all)
 
 XLIBS = @SLAPD_LIBS@ libbackends.a \
-	-lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ -llutil @LUTIL_LIBS@
+	-lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \
+	$(KRB_LIBS) -llutil @LUTIL_LIBS@
 
 slapd: version.o
-	$(CC) $(LDFLGS) -o $@ $(OBJS) version.o $(LIBS)
+	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
+
+sslapd: version.o
+	$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
 
 backendslib:	FORCE
 	@for i in back-*; do \
@@ -81,30 +86,45 @@ version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
 	-e "s|%VERSION%|$${v}|" \
 	< $(srcdir)/Version.c > $@)
 
-clean-local: FORCE
-	@for i in back-* tools; do \
+depend-local-srv: FORCE
+	@for i in back-* shell-backends tools; do \
+		if [ -d $$i ]; then \
+			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
+			( cd $$i; $(MAKE) $(MFLAGS) depend ); \
+		fi; \
+	done
+
+clean-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) clean ); \
 		fi; \
 	done
 
-install-local: install-slapd install-conf install-tools
+install-local-srv: install-slapd install-conf install-tools
 
 install-slapd: FORCE
 	@-$(MKDIR) $(libexecdir)
-	$(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir)
+
+CFFILES=slapd.conf slapd.at.conf slapd.oc.conf
 
 install-conf: FORCE
-	@-$(MKDIR) -p $(sysconfdir)
-	$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' slapd.conf > /tmp/slapd.$$
-	-$(MV) $(sysconfdir)/slapd.conf $(sysconfdir)/slapd.conf-
-	$(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(sysconfdir)/slapd.conf
-	$(RM) -f /tmp/slapd.$$
-	-$(MV) $(sysconfdir)/slapd.at.conf $(sysconfdir)/slapd.at.conf-
-	$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(sysconfdir)
-	-$(MV) $(sysconfdir)/slapd.oc.conf $(sysconfdir)/slapd.oc.conf-
-	$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(sysconfdir)
+	@-$(MKDIR) $(sysconfdir)
+	@for i in $(CFFILES); do \
+		tmpcf=/tmp/$$i.$$ ; \
+		$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $$i > $$tmpcf ; \
+		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; \
+		else \
+			echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
+		fi; \
+		$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i.default; \
+		$(RM) -f /tmp/slapd.$$ ; \
+	done
 
 install-tools: FORCE
 	@-$(MKDIR) $(sbindir)