diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-07 11:57:43 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-07 20:34:04 +0200 |
| commit | c95629101ba62754ec3d4f0691e4d2eca8db7f00 (patch) | |
| tree | aaca5596265f78640cebac0c32dc8e587994e94c | |
| parent | 373c3157884cd04b3fb5b110e4ba42c158bfcf3f (diff) | |
| download | samba-c95629101ba62754ec3d4f0691e4d2eca8db7f00.tar.gz samba-c95629101ba62754ec3d4f0691e4d2eca8db7f00.tar.bz2 samba-c95629101ba62754ec3d4f0691e4d2eca8db7f00.zip | |
build: fix creation of libsmbsharemodes.a - don't link in libtdb.a.
a step in fixing bug #5590
Michael
(This used to be commit 76f9e2e64644c6f21baf523b91455dc3aebb2163)
| -rw-r--r-- | source3/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 04c4284c8d..592619bad5 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1952,7 +1952,9 @@ uninstallclientlib:: uninstalllibsmbclient # #------------------------------------------------------------------- -LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o @LIBTDB_STATIC@ +LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o + +LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) @LIBTDB_STATIC@ LIBSMBSHAREMODES_SHARED_TARGET=@LIBSMBSHAREMODES_SHARED_TARGET@ LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@ @@ -1975,9 +1977,9 @@ $(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) @rm -f $@ @ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@ -$(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) +$(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ) + @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ0) libsmbsharemodes: $(LIBSMBSHAREMODES) |