Update build environment:

[openldap] / servers / ldapd / Makefile.in

diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index 8a7d913485346d4368287521e16259506d8117ec..cd683ae16e005de6fb8fd7a770f6e7e7e424a691 100644 (file)
--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@@ -3,35 +3,36 @@
 ##
 PROGRAMS=ldapd
 XPROGRAMS=sldapd
-SRCS   = main.c detach.c setproctitle.c request.c bind.c result.c error.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
-OBJS   = main.o detach.o setproctitle.o request.o bind.o result.o error.o \
+OBJS   = main.o request.o bind.o result.o error.o \
        search.o util.o compare.o message.o add.o delete.o modrdn.o modify.o \
        abandon.o syntax.o association.o kerberos.o LDAP_tables.o \
        certificate.o
 
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
 BUILD_OPT = "--enable-ldapd"
 BUILD_SRV = @BUILD_LDAPD@
 
-XDEFS= @LDAPD_DEFS@
-XLIBS= @LDAPD_LIBS@
-
-all-local: $(PROGRAMS)
+XLIBS= @LDAPD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@
 
 ldapd: version.o
-       $(CC) $(LDFLAGS) -o $@ $(OBJS) version.o $(LIBS)
+       $(LDLINK) -o $@ $(OBJS) version.o $(LIBS)
 
 sldapd:        version.o
-       $(CC) $(LDFLAGS) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv
+       $(LDLINK) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv
 
-version.c: $(OBJS) $(LDIR)/liblber/liblber.a
+version.c: $(OBJS) $(LDAP_LIBDIR)/liblber/liblber.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}|" \
-       < Version.c > $@)
+       < $(srcdir)/Version.c > $@)
 
 request.o:     LDAP-types.h
 
@@ -44,6 +45,6 @@ LDAP_tables.c:        ldap.py
 
 LDAP-types.h: LDAP_tables.c
 
-install-local: FORCE
-       @$(MKDIR) -p $(libexecdir)
-       $(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)
+install-srv: FORCE
+       @$(MKDIR) $(libexecdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR)