svn commit: samba r23694 - in branches: SAMBA_3_0/source SAMBA_3_0_26/source

[jerry at samba.org]

Author: jerry
Date: 2007-07-04 00:41:58 +0000 (Wed, 04 Jul 2007)
New Revision: 23694

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23694

Log:
Make sure that when builddir != srcdir, we can still find the exports 
files and library-versions file.  

Also move the "-o $@" from the individual targets and into the SHLD_DSO 
command.


Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0_26/source/Makefile.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2007-07-04 00:34:16 UTC (rev 23693)
+++ branches/SAMBA_3_0/source/Makefile.in	2007-07-04 00:41:58 UTC (rev 23694)
@@ -22,10 +22,10 @@
 SHLD=@SHLD@
 
 ## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,exports/`basename $@ | sed 's/@SHLIBEXT@$$/syms/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@$$/syms/'`
 DSO_EXPORTS=@DSO_EXPORTS@
-SONAME_VER=`grep ^$@ $(srcdir)/library-versions | cut -d: -f2`
-SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) 
+SONAME_VER=`grep ^$@ $(builddir)/library-versions | cut -d: -f2`
+SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
 
 # Add $(DEVELOPER_CFLAGS) to $(CFLAGS) to enable extra compiler
 # (GCC) warnings. This is done automtically for --enable-developer
@@ -1352,7 +1352,7 @@
 
 bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
 	@echo Linking libaddns shared library $@
-	@$(SHLD_DSO) -o $@ $(LIBADDNS_OBJ) $(LDFLAGS) $(LIBS) \
+	@$(SHLD_DSO) $(LIBADDNS_OBJ) $(LDFLAGS) $(LIBS) \
 		$(KRB5LIBS) $(UUID_LIBS)\
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
@@ -1362,7 +1362,7 @@
 
 bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
 	@echo Linking libsmbclient shared library $@
-	@$(SHLD_DSO) -o $@ $(LIBSMBCLIENT_OBJ) $(LDFLAGS) $(LIBS) \
+	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LDFLAGS) $(LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
@@ -1372,7 +1372,7 @@
 
 bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ)
 	@echo Linking libsmbsharemodes shared library $@
-	@$(SHLD_DSO) -o $@ $(LIBSMBSHAREMODES_OBJ) $(LDFLAGS) $(LIBS) \
+	@$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LDFLAGS) $(LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) \
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
@@ -1382,7 +1382,7 @@
 
 bin/libmsrpc. at SHLIBEXT@: $(BINARY_PREREQS) $(CAC_OBJ)
 	@echo Linking libmsrpc shared library $@
-	@$(SHLD_DSO) -o $@ $(CAC_OBJ) $(LDFLAGS) $(LIBS) \
+	@$(SHLD_DSO) $(CAC_OBJ) $(LDFLAGS) $(LIBS) \
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
 bin/libmsrpc.a: $(BINARY_PREREQS) $(CAC_OBJ)

Modified: branches/SAMBA_3_0_26/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_26/source/Makefile.in	2007-07-04 00:34:16 UTC (rev 23693)
+++ branches/SAMBA_3_0_26/source/Makefile.in	2007-07-04 00:41:58 UTC (rev 23694)
@@ -22,10 +22,10 @@
 SHLD=@SHLD@
 
 ## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,exports/`basename $@ | sed 's/@SHLIBEXT@$$/syms/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@$$/syms/'`
 DSO_EXPORTS=@DSO_EXPORTS@
-SONAME_VER=`grep ^$@ $(srcdir)/library-versions | cut -d: -f2`
-SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) 
+SONAME_VER=`grep ^$@ $(builddir)/library-versions | cut -d: -f2`
+SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
 
 # Add $(DEVELOPER_CFLAGS) to $(CFLAGS) to enable extra compiler
 # (GCC) warnings. This is done automtically for --enable-developer
@@ -1310,7 +1310,7 @@
 
 bin/libaddns. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ)
 	@echo Linking libaddns shared library $@
-	@$(SHLD_DSO) -o $@ $(LIBADDNS_OBJ) $(LDFLAGS) $(LIBS) \
+	@$(SHLD_DSO) $(LIBADDNS_OBJ) $(LDFLAGS) $(LIBS) \
 		$(KRB5LIBS) $(UUID_LIBS)\
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
@@ -1320,7 +1320,7 @@
 
 bin/libsmbclient. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
 	@echo Linking libsmbclient shared library $@
-	@$(SHLD_DSO) -o $@ $(LIBSMBCLIENT_OBJ) $(LDFLAGS) $(LIBS) \
+	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LDFLAGS) $(LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)
 
@@ -1330,7 +1330,7 @@
 
 bin/libsmbsharemodes. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ)
 	@echo Linking libsmbsharemodes shared library $@
-	@$(SHLD_DSO) -o $@ $(LIBSMBSHAREMODES_OBJ) $(LDFLAGS) $(LIBS) \
+	@$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LDFLAGS) $(LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) \
 		@SONAMEFLAG@`basename $@`.$(SONAME_VER)