Changeset 480 for trunk/server/source3/Makefile.in

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/Makefile.in (modified) (5 diffs)

trunk/server/source3/Makefile.in

@@ -43 +43 @@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
+PICFLAG=@PICFLAG@
 
 EXEEXT=@EXEEXT@
 AR=@AR@
-LDSHFLAGS=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
-LDSHFLAGS_MODULES=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
+LDSHFLAGS=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
+LDSHFLAGS_MODULES=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
 LDFLAGS=@PIE_LDFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
 
-WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
+WINBIND_NSS_LDSHFLAGS=$(PICFLAG) @WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
 AWK=@AWK@
-PICFLAG=@PICFLAG@
 DYNEXP=@DYNEXP@
 PERL=@PERL@
@@ -1682 +1682 @@
 bin/replacetort@EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
         @echo Linking $@
-        @$(CC) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
+        @$(CC) -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
                 $(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
 
 bin/smbconftort@EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
         @echo Linking $@
-        @$(CC) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
+        @$(CC) -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
                 $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
@@ -1780 +1780 @@
 bin/smbfilter@EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
         @echo Linking $@
-        @$(CC) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
+        @$(CC) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
                 $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                 @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
@@ -2924 +2924 @@
         @echo "Linking $@"
         @$(CC) -o $@ $(TEST_LP_LOAD_OBJ) \
-                $(LDFLAGS) $(DYNEEXP) $(LIBS) \
+                $(LDFLAGS) $(DYNEXP) $(LIBS) \
                 $(LDAP_LIBS) \
                 $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
@@ -2931 +2931 @@
         @echo "Linking $@"
         @$(CC) -o $@ $(DBWRAP_TOOL_OBJ)\
-                $(LDFLAGS) $(DYNEEXP) $(LIBS) \
+                $(LDFLAGS) $(DYNEXP) $(LIBS) \
                 $(LDAP_LIBS) \
                 @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \