Set BDB's global allocators to ber_*, don't bother with the per-env setting.

[openldap] / build / lib-shared.mk

diff --git a/build/lib-shared.mk b/build/lib-shared.mk
index 26a9c1a897b443cd9b03aa4e59b454545dcfaeac..a01e0f27c251fc5320535077bb7f80102daa8d3d 100644 (file)
--- a/build/lib-shared.mk
+++ b/build/lib-shared.mk
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-## Copyright 1998-2000 The OpenLDAP Foundation
+## Copyright 1998-2002 The OpenLDAP Foundation
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 ##---------------------------------------------------------------------------
@@ -7,46 +7,15 @@
 ## Makefile Template for Shared Libraries
 ##
 
-NT_LTFLAGS = --only-$(LINKAGE)
-LTFLAGS = $(@PLAT@_LTFLAGS) 
-
-NT_DYN_LT_NO_UNDEF = -no-undefined
-LT_NO_UNDEF = $(@PLAT@_@LIB_LINKAGE@_LT_NO_UNDEF)
-
-COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(EXTRA_DEFS) -c
-LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -rpath $(libdir) \
-       $(CFLAGS) $(LDFLAGS) $(LTVERSION) $(LT_NO_UNDEF)
-
 MKDEPFLAG = -l
 
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(COMPILE) $<
-
-
-# DYN_EXT (@DYN_EXT@) describes the extension assoicated with a
-# dynamic library, e.g. so, dll
-
-DYN_EXT=@DYN_EXT@
+       $(LTCOMPILE_LIB) $<
 
-$(LIBRARY):  version.lo
-       $(LTLIBLINK) -o $@ $(OBJS) version.lo $(EXTRA_LIBS)
-       $(RM) ../$@
-       d=`$(PWD)`; d=`$(BASENAME) $$d`; cd ..; $(LN_S) $$d/$@ $@; \
-       t=`$(BASENAME) $@ .la`.a; $(RM) $$t; $(LN_S) $$d/.libs/$$t $$t
-       @# If we want our binaries to link dynamically with libldap{,_r} liblber
-       @# We also symlink the .so, so we can run the tests without installing
-       if test "$(LINK_BINS_DYNAMIC)" = "yes"; then \
-               d=`$(PWD)`; d=`$(BASENAME) $$d`; b=`$(BASENAME) $@ .la`; \
-                cd .libs; t=`echo $$b*.$(DYN_EXT)`; (cd ../.. ; $(RM) $$t; \
-                $(LN_S) $$d/.libs/$$t $$t); \
-               if test "$(DYN_EXT)" != dll; then \
-                   t=`echo $$b.$(DYN_EXT).?`; cd ../.. ; \
-                   $(RM) $$t; \
-                   $(LN_S) $$d/.libs/$$t $$t; \
-               fi \
-       fi
+$(LIBRARY): version.lo
+       $(LTLINK_LIB) -o $@ $(OBJS) version.lo $(LINK_LIBS)
 
 Makefile: $(top_srcdir)/build/lib-shared.mk