From c72a795bfaade8dd6117384806619f54bc442132 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 14 Aug 2008 14:44:30 +0200 Subject: [PATCH] Revert "build: fix creation of libsmbsharemodes.a - don't link in libtdb.a." This reverts commit 4fc57a0a90390ede1161fd6f231ea274c9c74b20. In preparation of picking libraray creation/install fixes. To be re-added later in upstream form. Michael --- source/Makefile.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/Makefile.in b/source/Makefile.in index 696abb5a561..86c28005809 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -775,8 +775,7 @@ LIBSMBCLIENT_OBJ0 = \ LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ0) @LIBWBCLIENT_STATIC@ -LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o -LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) @LIBTDB_STATIC@ +LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o @LIBTDB_STATIC@ # This shared library is intended for linking with unit test programs # to test Samba internals. It's called libbigballofmud.so to @@ -1831,9 +1830,9 @@ bin/libsmbsharemodes.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBT $(KRB5LIBS) $(LDAP_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) -bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0) +bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ0) + @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ) # This is probably wrong for anything other than the GNU linker. bin/libbigballofmud.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_SHARED@ -- 2.11.4.GIT