diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-07 18:32:50 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-07 20:34:04 +0200 |
| commit | b7f0ad4488b84bbbdfe9352147c2557cab21c288 (patch) | |
| tree | 66f3cc81bc133805ddf7b2dfe78c394f2b52bd2b | |
| parent | b079636bf7e3dcb1e97fe4484287f232e5dfe5e7 (diff) | |
| download | samba-b7f0ad4488b84bbbdfe9352147c2557cab21c288.tar.gz samba-b7f0ad4488b84bbbdfe9352147c2557cab21c288.tar.bz2 samba-b7f0ad4488b84bbbdfe9352147c2557cab21c288.zip | |
build: fix creation of libsmbclient.a - don't link in libtalloc.a
a step in fixing bug #5590
Michael
(This used to be commit bae7bd4bba4d49edec9cb58d47c1cb82aba16c6b)
| -rw-r--r-- | source3/Makefile.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index ceac1f7cc5..b4264de263 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -739,7 +739,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 @@ -1310,10 +1310,10 @@ bin/umount.cifs@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@ -bin/cifs.spnego@EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ0) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +bin/cifs.spnego@EXEEXT@: $(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@ @@ -1884,13 +1884,15 @@ 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@ LIBSMBCLIENT_SHARED_TARGET=@LIBSMBCLIENT_SHARED_TARGET@ LIBSMBCLIENT_SOVER=@LIBSMBCLIENT_SOVER@ |