From 92e0a9c1b71eda9cc8681e4b28f06431568aaf05 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 7 Jul 2008 11:57:43 +0200 Subject: [PATCH] build: fix creation of libsmbsharemodes.a - don't link in libtdb.a. a step in fixing bug #5590 Michael (cherry picked from commit 76f9e2e64644c6f21baf523b91455dc3aebb2163) --- source/Makefile.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/Makefile.in b/source/Makefile.in index 98038b38a3a..a211e4bbb59 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1928,7 +1928,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@ @@ -1951,9 +1953,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) -- 2.11.4.GIT