Rework ac/socket.h for HAVE_WINSOCK:

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 0caa3dcd01d202edd09907245ffe1c592b19500e..b1e51d9624a14c695c6e4ddfefe0beb99d5f244a 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -23,7 +23,7 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 # $(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)
@@ -35,6 +35,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)
@@ -75,12 +76,7 @@ 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 
+version.c: libbackends.a $(OBJS) $(SLAPD_LIBDEPEND) 
        $(RM) $@
        (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
        t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
@@ -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
 
@@ -113,20 +118,32 @@ 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