diff options
| author | Gerald Carter <jerry@samba.org> | 2007-07-04 00:41:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:46 -0500 |
| commit | 866e39ad25cba1db70d9c2b207f28920967853b0 (patch) | |
| tree | 26c31ed7bbe6afedc1b20c44b0ab80ac2ccc5498 | |
| parent | 9f03efd6e5dbf49d85798cc6f320828f65ef3c3a (diff) | |
| download | samba-866e39ad25cba1db70d9c2b207f28920967853b0.tar.gz samba-866e39ad25cba1db70d9c2b207f28920967853b0.tar.bz2 samba-866e39ad25cba1db70d9c2b207f28920967853b0.zip | |
r23694: 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.
(This used to be commit c85311b3a8a891af4b4c8eb1f09bd91f00a1f5db)
| -rw-r--r-- | source3/Makefile.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index bc0fb2b0ff..5838829264 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -22,10 +22,10 @@ CC=@CC@ 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/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ bin/libaddns.@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/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) bin/libsmbclient.@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/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) bin/libsmbsharemodes.@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/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) bin/libmsrpc.@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) |