Ready for release

[openldap] / build / top.mk

diff --git a/build/top.mk b/build/top.mk
index 154be9dd814e69d5b8c8350597fd6caf3f631d09..7c17468bfc41d7c8ba847a0c96d6f54a3906387b 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -1,5 +1,7 @@
 # $OpenLDAP$
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -56,6 +58,8 @@ INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_SCRIPT = $(INSTALL)
 
+STRIP = -s
+
 LINT = lint
 5LINT = 5lint
 
@@ -77,9 +81,9 @@ LTONLY_LIB = $(@PLAT@_LTONLY_LIB)
 
 # libtool --only flag for modules: depends on linkage of module
 # The BUILD_MOD macro is defined in each backend Makefile.in file
-LTONLY_yes = static
-LTONLY_mod = shared
-LTONLY_MOD = # --only-$(BUILD_MOD)
+LTONLY_yes = --tag=disable-shared
+LTONLY_mod = --tag=disable-static
+LTONLY_MOD = $(LTONLY_$(BUILD_MOD))
 
 # platform-specific libtool flags
 NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir)
@@ -137,6 +141,7 @@ PWD = pwd
 RANLIB = @RANLIB@
 RM = rm -f
 SED = sed
+SUBST = $(SHTOOL) subst
 
 # For manual pages
 # MANCOMPRESS=@MANCOMPRESS@
@@ -192,7 +197,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
 SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
 SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
 
-SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
 SLURPD_LIBS = @SLURPD_LIBS@
 
 # Our Defaults