UNDO LAST COMMIT.

[openldap] / build / top.mk

diff --git a/build/top.mk b/build/top.mk
index 5bfb0e2cf261abb3157615ee3e5cbab019902693..a72be162659b1cc11acce333ea958946de1006b6 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -1,4 +1,3 @@
-##
 ## Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
 ## All rights reserved.
 ##
@@ -20,33 +19,28 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-
 ldap_subdir = @ldap_subdir@
-bindir = @bindir@
-datadir = @datadir@/$(ldap_subdir)
-includedir = @includedir@
-infodir = @infodir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@/$(ldap_subdir)
+
+bindir = $(TMPROOT)@bindir@
+datadir = $(TMPROOT)@datadir@/$(ldap_subdir)
+includedir = $(TMPROOT)@includedir@
+infodir = $(TMPROOT)@infodir@
+libdir = $(TMPROOT)@libdir@
+libexecdir = $(TMPROOT)@libexecdir@
+localstatedir = $(TMPROOT)@localstatedir@
+mandir = $(TMPROOT)@mandir@
+sbindir = $(TMPROOT)@sbindir@
+sharedstatedir = $(TMPROOT)@sharedstatedir@
+sysconfdir = $(TMPROOT)@sysconfdir@/$(ldap_subdir)
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-MV = mv
-LN = ln
-LN_S = @LN_S@
-RM = rm -f
-MAKEINFO = @MAKEINFO@
-RANLIB = @RANLIB@
-AR = ar
-
 LINT = lint
 5LINT = 5lint
 MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -d "$(srcdir)" -c "$(CC)"
@@ -56,15 +50,24 @@ LIBVERSION = 0:0:0
 LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
-# Misc UNIX commands used in makefiles
-SED = sed
-DATE = date
-HOSTNAME = uname -n
+# Misc UNIX commands used in build environment
+AR = ar
+AWK = @AWK@
 BASENAME = basename
-PWD = pwd
 CAT = cat
-MKDIR = mkdir -p
 CHMOD = chmod
+DATE = date
+HOSTNAME = uname -n
+LN = ln
+LN_H = @LN_H@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+MKDIR = mkdir -p
+MV = mv
+PWD = pwd
+RANLIB = @RANLIB@
+RM = rm -f
+SED = sed
 
 # Misc UNIX commands used in programs
 EDITOR = @EDITOR@
@@ -85,34 +88,34 @@ LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
 LDAP_LIBADIR= $(top_builddir)/libraries
 LDAP_LIBPATH= -L$(LDAP_LIBADIR)
 
-LDAP_LIBLBER = -llber
-LDAP_LIBLDAP = -lldap
-LDAP_LIBLDIF = -lldif
-LDAP_LIBLUTIL = -llutil @LUTIL_LIBS@
-LDAP_LIBLDBM = -lldbm @LDBM_LIBS@
-LDAP_LIBLTHREAD = -llthread @LTHREAD_LIBS@
+LUTIL_LIBS = @LUTIL_LIBS@
+LDBM_LIBS = @LDBM_LIBS@
+LTHREAD_LIBS = @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) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) \
-       $(LDAP_LIBLDIF) $(LDAP_LIBLUTIL)
+LDAP_LIBAVL_DEPEND = $(LDAP_LIBDIR)/libavl/libavl.a
+LDAP_LIBLDBM_DEPEND = $(LDAP_LIBDIR)/libldbm/libldbm.a
+LDAP_LIBLTHREAD_DEPEND = $(LDAP_LIBDIR)/libldap_r/libldap_r.la
 
 LDAP_LIBDEPEND = $(LDAP_LIBLDAP_DEPEND) $(LDAP_LIBLBER_DEPEND) \
        $(LDAP_LIBLDIF_DEPEND) $(LDAP_LIBLUTIL_DEPEND)
+SLAPD_LIBDEPEND = $(LDAP_LIBDEPEND) $(LDAP_LIBAVL_DEPEND) \
+       $(LDAP_LIBLDBM_DEPEND) $(LDAP_LIBLTHREAD_DEPEND)
 
 # AutoConfig generated 
 AC_CC  = @CC@
 AC_CFLAGS = @CFLAGS@
-AC_DEFS = @CPPFLAGS@ @DEFS@
+AC_DEFS = @CPPFLAGS@ # @DEFS@
 AC_LDFLAGS = @LDFLAGS@
 AC_LIBS = @LIBS@
 
 KRB_LIBS = @KRB_LIBS@
+PERL_CPPFLAGS = @SLAPD_PERL_CPPFLAGS@
+PERL_LDFLAGS = @SLAPD_PERL_LDFLAGS@
 TERMCAP_LIBS = @TERMCAP_LIBS@
 
 LDAPD_LIBS = @LDAPD_LIBS@
@@ -122,9 +125,9 @@ SLURPD_LIBS = @SLURPD_LIBS@
 # Our Defaults
 CC = $(AC_CC)
 DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
-LIBS = $(XLIBS) $(AC_LIBS) $(XXLIBS)
 CFLAGS = $(AC_CFLAGS) $(DEFS)
-LDFLAGS = $(AC_LDFLAGS) $(XLDFLAGS)
+LDFLAGS = $(LDAP_LIBPATH) $(AC_LDFLAGS) $(XLDFLAGS)
+LIBS = $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
 
 all:           all-common all-local FORCE
 install:       install-common install-local FORCE