Update LTLINK to consisently use LDFLAGS and -rpath

diff --git a/build/lib-shared.mk b/build/lib-shared.mk
index 3952bcf3c9a753437cb2e85a0655fae1979c5c6d..26a9c1a897b443cd9b03aa4e59b454545dcfaeac 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,7 +31,7 @@ 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

diff --git a/build/mod.mk b/build/mod.mk
index 7433cf07898282f68ff25cec2897e44e13a7a181..a1ef38df06dacf464c8ee8242cb63e124d4b423b 100644 (file)
--- a/build/mod.mk
+++ b/build/mod.mk
@@ -12,9 +12,9 @@ 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)
+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(MODDEFS) -c
+LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -rpath $(moduledir) \
+       $(CFLAGS) $(LDFLAGS) $(LTVERSION) $(LT_NO_UNDEF)
 
 MKDEPFLAG = -l
 
@@ -33,7 +33,7 @@ version.c: $(OBJS)
        $(MKVERSION) $(LIBBASE) > $@
 
 $(LIBRARY): $(MODDEPS) version.lo
-       $(LTLIBLINK) -module -rpath $(moduledir) -o $@ $(OBJS) version.lo \
+       $(LTLIBLINK) -module -o $@ $(OBJS) version.lo \
            $(MODLIBS)
 
 $(LIBSTAT): version.lo

diff --git a/build/top.mk b/build/top.mk
index 75791071dff3585ed9788ff07d3e3b86a8d48c1b..09dc51929a96dd6923ec42970727cda13695ea17 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -57,7 +57,11 @@ MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 LIBTOOL = @LIBTOOL@
 LIBVERSION = 2:3:0
 LTVERSION = -version-info $(LIBVERSION)
-LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
+#We don't use our own shared libraries (yet)
+#LTLINK  = $(LIBTOOL) --mode=link $(CC) -rpath $(libdir) \
+#      $(CFLAGS) $(LDFLAGS)
+LTLINK  = $(LIBTOOL) --mode=link $(CC) \
+       $(CFLAGS) $(LDFLAGS)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
 # Misc UNIX commands used in build environment