The branch, v3-2-test has been updated
via dcf986937ccf5e6947c4214aa0838733ed7f3b9b (commit)
via 4fc57a0a90390ede1161fd6f231ea274c9c74b20 (commit)
from e6ddd28000c92ecd119fdc06197d931394f762cb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit dcf986937ccf5e6947c4214aa0838733ed7f3b9b
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Mon Jul 7 14:14:35 2008 +0200
build: fix creation of libsmbclient.a - don't link in libtalloc.a
Second step in fixing bug #5590.
Michael
commit 4fc57a0a90390ede1161fd6f231ea274c9c74b20
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Mon Jul 7 13:52:46 2008 +0200
build: fix creation of libsmbsharemodes.a - don't link in libtdb.a.
First step in fixing bug #5590.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 04ff7cc..4c93b2f 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -771,7 +771,7 @@ PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ)
$(PARAM_OBJ) $(PASSDB_OBJ) @LIB
$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
$(LDB_OBJ)
-SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ0)
@LIBWBCLIENT_STATIC@
+SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ1)
@LIBWBCLIENT_STATIC@
DISPLAY_SEC_OBJ= lib/display_sec.o
@@ -806,15 +806,18 @@ LIBSMBCLIENT_OBJ0 = \
libsmb/libsmb_server.o \
libsmb/libsmb_stat.o \
libsmb/libsmb_xattr.o \
- libsmb/libsmb_setget.o \
+ libsmb/libsmb_setget.o
+
+LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
-LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ0) @LIBWBCLIENT_STATIC@
+LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) @LIBWBCLIENT_STATIC@
-LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o @LIBTDB_STATIC@
+LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
+LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) @LIBTDB_STATIC@
# This shared library is intended for linking with unit test programs
# to test Samba internals. It's called libbigballofmud.so to
@@ -1378,10 +1381,10 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS)
$(CIFS_UMOUNT_OBJ) @BUILD_POPT@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
-bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ)
$(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@LIBWBCLIENT_SHARED@
+bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ)
$(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
@LIBWBCLIENT_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) \
- -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ0) $(KRB5LIBS) \
+ -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
$(LDAP_LIBS) @POPTLIBS@ @LIBTALLOC_LIBS@ @LIBWBCLIENT_SHARED@ \
@LIBTDB_LIBS@
@@ -1661,9 +1664,9 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS)
$(LIBSMBSHAREMODES_OBJ) @LIBT
$(KRB5LIBS) $(LDAP_LIBS) \
@[EMAIL PROTECTED] [EMAIL PROTECTED](SONAME_VER)
-bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ)
+bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
@echo Linking non-shared library $@
- @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ)
+ @-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ0)
# This is probably wrong for anything other than the GNU linker.
bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ)
@LIBTALLOC_SHARED@
--
Samba Shared Repository
