Fix Winsock-related warnings and/or bugs.

[openldap] / servers / ldapd / Makefile.in

diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index 2cf4cf330de152b44af0d24a88310dd709a592ce..9e4723dfc010f81b86f7e6a67276852bd1d4b115 100644 (file)
--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@@ -1,9 +1,12 @@
+# $OpenLDAP$
 ##
 ## Makefile.in for ldapd
 ##
 PROGRAMS=ldapd
 XPROGRAMS=sldapd
 
+XSRCS  = version.c
+
 SRCS   = main.c request.c bind.c result.c error.c \
        search.c util.c compare.c message.c add.c delete.c modrdn.c modify.c \
        abandon.c syntax.c association.c kerberos.c certificate.c
@@ -18,21 +21,20 @@ LDAP_LIBDIR= ../../libraries
 BUILD_OPT = "--enable-ldapd"
 BUILD_SRV = @BUILD_LDAPD@
 
-XLIBS= @LDAPD_LIBS@ -llutil @LUTIL_LIBS@
+all-local-srv:         ldapd
+
+XLIBS= -llber -llutil
+XXLIBS= $(LDAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
 
 ldapd: version.o
-       $(LDLINK) -o $@ $(OBJS) version.o $(LIBS)
+       $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
 
 sldapd:        version.o
-       $(LDLINK) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv
+       $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
 
-version.c: $(OBJS) $(LDAP_LIBDIR)/liblber/liblber.a
+version.c: $(OBJS) $(LDAP_LIBLBER_DEPEND)
        $(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 > $@)
+       $(MKVERSION) ldapd > $@
 
 request.o:     LDAP-types.h
 
@@ -45,6 +47,6 @@ LDAP_tables.c:        ldap.py
 
 LDAP-types.h: LDAP_tables.c
 
-install-local: FORCE
-       @$(MKDIR) -p $(libexecdir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)
+install-local-srv: FORCE
+       -$(MKDIR) $(DESTDIR)$(libexecdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(DESTDIR)$(libexecdir)