minor cleanup

[openldap] / build / lib-shared.mk

diff --git a/build/lib-shared.mk b/build/lib-shared.mk
index 3952bcf3c9a753437cb2e85a0655fae1979c5c6d..20f4aa4b89792c001ba25d156035c53f7512ab0a 100644 (file)
--- a/build/lib-shared.mk
+++ b/build/lib-shared.mk
@@ -14,8 +14,8 @@ 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) $(CFLAGS) $(LDFLAGS) \
-               $(LTVERSION) $(LT_NO_UNDEF)
+LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -rpath $(libdir) \
+       $(CFLAGS) $(LDFLAGS) $(LTVERSION) $(LT_NO_UNDEF)
 
 MKDEPFLAG = -l
 
@@ -31,12 +31,10 @@ MKDEPFLAG = -l
 DYN_EXT=@DYN_EXT@
 
 $(LIBRARY):  version.lo
-       $(LTLIBLINK) -rpath $(libdir) -o $@ $(OBJS) version.lo $(EXTRA_LIBS)
+       $(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; \