X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Ftop.mk;h=0e8a4b387f0715060721e1ccb5cfb5e9adcf2f2b;hb=6437785a82b31cd58bf3bc685f81b4db9d92dd91;hp=2ca2a0524e42bc0deb481c390ceee510cf5f5093;hpb=2a220163d76c47c5e61d9a922d29521f6d1596c0;p=openldap

diff --git a/build/top.mk b/build/top.mk
index 2ca2a0524e..0e8a4b387f 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -1,4 +1,4 @@
-##
+# $OpenLDAP$
 ## Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
 ## All rights reserved.
 ##
@@ -20,51 +20,63 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-
 ldap_subdir = @ldap_subdir@
+
 bindir = @bindir@
-datadir = @datadir@/$(ldap_subdir)
+datadir = @datadir@$(ldap_subdir)
 includedir = @includedir@
 infodir = @infodir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+moduledir = @libexecdir@$(ldap_subdir)
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@/$(ldap_subdir)
+sysconfdir = @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)"
+
+MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) \
+	-d "$(srcdir)" -c "$(MKDEP_CC)" -m "$(MKDEP_CFLAGS)"
+MKDEP_CC	= @OL_MKDEP@
+MKDEP_CFLAGS = @OL_MKDEP_FLAGS@
+
+MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 
 LIBTOOL = @LIBTOOL@
 LIBVERSION = 0:0:0
-LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
+LTVERSION = -version-info $(LIBVERSION)
+LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
 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@
@@ -77,55 +89,62 @@ SENDMAIL = @SENDMAIL@
 MANCOMPRESS=$(CAT)
 MANCOMPRESSSUFFIX=
 
-# Version
-VERSIONFILE = $(top_srcdir)/build/version
-
 INCLUDEDIR= $(top_srcdir)/include
 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@
+LDIF_LIBS = @LDIF_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_LIBLDIF) \
-	$(LDAP_LIBLDAP) $(LDAP_LIBLBER) \
-	$(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)
 
+WRAP_LIBS = @WRAP_LIBS@
 # 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@
+KRB4_LIBS = @KRB4_LIBS@
+KRB5_LIBS = @KRB5_LIBS@
+KRB_LIBS = @KRB4_LIBS@ @KRB5_LIBS@
+SASL_LIBS = @SASL_LIBS@
+TLS_LIBS = @TLS_LIBS@
+SECURITY_LIBS = @SASL_LIBS@ $(KRB_LIBS) @TLS_LIBS@
+
+MODULES_CPPFLAGS = @SLAPD_MODULES_CPPFLAGS@
+MODULES_LDFLAGS = @SLAPD_MODULES_LDFLAGS@
+MODULES_LIBS = @MODULES_LIBS@
 TERMCAP_LIBS = @TERMCAP_LIBS@
+SLAPD_PERL_LDFLAGS = @SLAPD_PERL_LDFLAGS@
+LINK_BINS_DYNAMIC = @LINK_BINS_DYNAMIC@
 
 LDAPD_LIBS = @LDAPD_LIBS@
-SLAPD_LIBS = @SLAPD_LIBS@
+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@
 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
@@ -161,3 +180,4 @@ Makefile: Makefile.in $(top_srcdir)/build/top.mk
 FORCE:
 
 ##---------------------------------------------------------------------------
+