Update build environment to fix VPATH support.

[openldap] / build / top.mk

diff --git a/build/top.mk b/build/top.mk
index 96034a501cc49137ec8a0abfc6ddec15aba06aa4..5bfb0e2cf261abb3157615ee3e5cbab019902693 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -49,11 +49,11 @@ AR = ar
 
 LINT = lint
 5LINT = 5lint
-MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -c "$(CC)"
+MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -d "$(srcdir)" -c "$(CC)"
 
 LIBTOOL = @LIBTOOL@
 LIBVERSION = 0:0:0
-LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) $(LTVERSION)
+LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
 # Misc UNIX commands used in makefiles
@@ -85,32 +85,46 @@ LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
 LDAP_LIBADIR= $(top_builddir)/libraries
 LDAP_LIBPATH= -L$(LDAP_LIBADIR)
 
-LDAP_LIBLBER = $(LDAP_LIBADIR)/liblber/liblber.la
-LDAP_LIBLDAP = $(LDAP_LIBADIR)/libldap/libldap.la
+LDAP_LIBLBER = -llber
+LDAP_LIBLDAP = -lldap
+LDAP_LIBLDIF = -lldif
+LDAP_LIBLUTIL = -llutil @LUTIL_LIBS@
+LDAP_LIBLDBM = -lldbm @LDBM_LIBS@
+LDAP_LIBLTHREAD = -llthread @LTHREAD_LIBS@
 
 LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber.la
 LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libldap.la
+LDAP_LIBLDIF_DEPEND = $(LDAP_LIBDIR)/libldif/libldif.a
+LDAP_LIBLUTIL_DEPEND = $(LDAP_LIBDIR)/liblutil/liblutil.a
+LDAP_LIBLDBM_DEPEND = $(LDAP_LIBDIR)/libldbm/libldbm.a
+LDAP_LIBLTHREAD_DEPEND = $(LDAP_LIBDIR)/liblthread/liblthread.a
 
-LDAP_LIBS = $(LDAP_LIBPATH) -lldif $(LDAP_LIBLDAP) $(LDAP_LIBLBER)
-LDAP_LIBDEPEND = $(LDAP_LIBDIR)/libldif.a $(LDAP_LIBLDAP) $(LDAP_LIBLBER)
+LDAP_LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) \
+       $(LDAP_LIBLDIF) $(LDAP_LIBLUTIL)
+
+LDAP_LIBDEPEND = $(LDAP_LIBLDAP_DEPEND) $(LDAP_LIBLBER_DEPEND) \
+       $(LDAP_LIBLDIF_DEPEND) $(LDAP_LIBLUTIL_DEPEND)
 
 # AutoConfig generated 
 AC_CC  = @CC@
-AC_DEFS = @CPPFLAGS@ @DEFS@
-AC_LIBS = @LDFLAGS@ @LIBS@
 AC_CFLAGS = @CFLAGS@
-AC_LDFLAGS =
+AC_DEFS = @CPPFLAGS@ @DEFS@
+AC_LDFLAGS = @LDFLAGS@
+AC_LIBS = @LIBS@
 
 KRB_LIBS = @KRB_LIBS@
 TERMCAP_LIBS = @TERMCAP_LIBS@
 
+LDAPD_LIBS = @LDAPD_LIBS@
+SLAPD_LIBS = @SLAPD_LIBS@
+SLURPD_LIBS = @SLURPD_LIBS@
+
 # Our Defaults
 CC = $(AC_CC)
-DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) 
-LIBS = $(LDAP_LIBS) $(XLIBS) $(AC_LIBS)
-
-CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES)
-LDFLAGS = $(AC_LDFLAGS)
+DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
+LIBS = $(XLIBS) $(AC_LIBS) $(XXLIBS)
+CFLAGS = $(AC_CFLAGS) $(DEFS)
+LDFLAGS = $(AC_LDFLAGS) $(XLDFLAGS)
 
 all:           all-common all-local FORCE
 install:       install-common install-local FORCE