X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=c75bf99eb1d667b246195e285400043284a1780d;hb=490bb72f82606c6872ec61d035467a0a912b4de7;hp=b057e0136e2eb18617f112f5fb6f8d4581b227d9;hpb=2e769ccf43ee14a213045adabf06b00c6f12d5bd;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index b057e0136e..c75bf99eb1 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -18,6 +18,9 @@ OBJS	= main.o daemon.o connection.o search.o filter.o add.o charray.o \
 		detach.o strdup.o tempnam.o repl.o lock.o \
 		schema.o schemaparse.o monitor.o configinfo.o
 
+LDAP_INCDIR= ../../include
+LDAP_LIBDIR= ../../libraries
+
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
@@ -26,9 +29,8 @@ all-local: FORCE
 	$(MAKE) $(MFLAGS) slapd
 	(cd tools; $(MAKE) $(MFLAGS) all)
 
-XDEFS = @SLAPD_DEFS@ @LDBM_DEFS@ @LTHREAD_DEFS@
 XLIBS = @SLAPD_LIBS@ libbackends.a \
-	-lavl -llutil -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@
+	-lavl -llutil -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ @LUTIL_LIBS@
 
 slapd: version.o
 	$(CC) $(LDFLGS) -o $@ $(OBJS) version.o $(LIBS)
@@ -66,22 +68,22 @@ libbackends.a: .backend
 	fi
 	@ls -l libbackends.a
 
-version.c: libbackends.a $(OBJS) \
-		$(LDAP_LIBDIR)/liblber.a \
-		$(LDAP_LIBDIR)/liblldbm.a \
-		$(LDAP_LIBDIR)/liblavl.a \
-		$(LDAP_LIBDIR)/liblldif.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}|" \
-	< Version.c > $@)
+	< $(srcdir)/Version.c > $@)
 
 clean-local: FORCE
 	@for i in back-* tools; do \
-		if [ -d $$i ] ; then \
+		if [ -d $$i ]; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) clean ); \
 		fi; \