cleanup

[openldap] / build / mod.mk

diff --git a/build/mod.mk b/build/mod.mk
index 7433cf07898282f68ff25cec2897e44e13a7a181..457b1365401c0e02f529e1af0f39c9b98b41cf76 100644 (file)
--- a/build/mod.mk
+++ b/build/mod.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.
 ##---------------------------------------------------------------------------
@@ -10,18 +10,12 @@
 LIBRARY = $(LIBBASE).la
 LIBSTAT = lib$(LIBBASE).a
 
-LTFLAGS = --only-$(LINKAGE)
-
-COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(MODDEFS) -c
-LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
-               $(LTVERSION) $(LT_NO_UNDEF)
-
 MKDEPFLAG = -l
 
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(COMPILE) $<
+       $(LTCOMPILE_MOD) $<
 
 all-no lint-no 5lint-no depend-no install-no: FORCE
        @echo "run configure with $(BUILD_OPT) to make $(LIBBASE)"
@@ -32,9 +26,8 @@ version.c: $(OBJS)
        $(RM) $@
        $(MKVERSION) $(LIBBASE) > $@
 
-$(LIBRARY): $(MODDEPS) version.lo
-       $(LTLIBLINK) -module -rpath $(moduledir) -o $@ $(OBJS) version.lo \
-           $(MODLIBS)
+$(LIBRARY): version.lo
+       $(LTLINK_MOD) -module -o $@ $(OBJS) version.lo $(LINK_LIBS)
 
 $(LIBSTAT): version.lo
        $(AR) ruv $@ `echo $(OBJS) | sed 's/\.lo/.o/g'` version.o