r24745: Merge Simo's shared lib build fix from svn r22842 that was lost

somehow.  Don't include the PIE_FLAGS when building shared libs.

diff --git a/source/Makefile.in b/source/Makefile.in
index 4e67f80c17f25d38bc1f4b832a86255017931b7f..da5d2c0e0409da5fd871019b81b1f82c67aeeba2 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -35,9 +35,9 @@ CFLAGS=@CFLAGS@
 CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
 
 EXEEXT=@EXEEXT@
-LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
 AR=@AR@
 LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@
+LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
 
 # The MODULE_EXPORTS variable conatins the platform-specific linker flags
 # needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules.
@@ -1354,7 +1354,7 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@
 
 bin/libaddns.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
        @echo Linking libaddns shared library $@
-       @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LDFLAGS) $(LIBS) \
+       @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \
                $(KRB5LIBS) $(UUID_LIBS)\
                @SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
@@ -1364,7 +1364,7 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
 
 bin/libsmbclient.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
        @echo Linking libsmbclient shared library $@
-       @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LDFLAGS) $(LIBS) \
+       @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
                @SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
@@ -1374,7 +1374,7 @@ bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
 
 bin/libsmbsharemodes.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ)
        @echo Linking libsmbsharemodes shared library $@
-       @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LDFLAGS) $(LIBS) \
+       @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) \
                @SONAMEFLAG@`basename $@`.$(SONAME_VER)