diff options
| author | Björn Jacke <bj@sernet.de> | 2010-01-29 15:23:29 +0100 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2010-01-29 15:26:36 +0100 |
| commit | a20b43f23f2254edb1fcd6d3916dd57e6a4778ee (patch) | |
| tree | 462ebfeec5c520d8f888fe013afb60194cc3a07f | |
| parent | e95e3270d1f3fece7292359d276ce45913a699ac (diff) | |
| download | samba-a20b43f23f2254edb1fcd6d3916dd57e6a4778ee.tar.gz samba-a20b43f23f2254edb1fcd6d3916dd57e6a4778ee.tar.bz2 samba-a20b43f23f2254edb1fcd6d3916dd57e6a4778ee.zip | |
s3: link thread objects in libsmbclient only and adjust linker flags
| -rw-r--r-- | source3/Makefile.in | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 873b46a1a1..6edb339dd7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -72,7 +72,7 @@ NSCD_LIBS=@NSCD_LIBS@ UUID_LIBS=@UUID_LIBS@ LIBWBCLIENT=@LIBWBCLIENT_STATIC@ @LIBWBCLIENT_SHARED@ LIBWBCLIENT_LIBS=@LIBWBCLIENT_LIBS@ -WINBIND_NSS_PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@ +PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@ DNSSD_LIBS=@DNSSD_LIBS@ AVAHI_LIBS=@AVAHI_LIBS@ POPT_LIBS=@POPTLIBS@ @@ -920,6 +920,10 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \ PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o localedir.o $(WBCOMMON_OBJ) \ $(LIBREPLACE_OBJ) @BUILD_INIPARSER@ +LIBSMBCLIENT_THREAD_OBJ = \ + libsmb/libsmb_thread_impl.o \ + libsmb/libsmb_thread_posix.o + LIBSMBCLIENT_OBJ0 = \ libsmb/libsmb_cache.o \ libsmb/libsmb_compat.o \ @@ -932,9 +936,7 @@ LIBSMBCLIENT_OBJ0 = \ libsmb/libsmb_server.o \ libsmb/libsmb_stat.o \ libsmb/libsmb_xattr.o \ - libsmb/libsmb_setget.o \ - libsmb/libsmb_thread_impl.o \ - libsmb/libsmb_thread_posix.o + libsmb/libsmb_setget.o LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ @@ -2277,11 +2279,11 @@ LIBSMBCLIENT_HEADERS=$(srcdir)/include/libsmbclient.h $(LIBSMBCLIENT_SYMS): $(LIBSMBCLIENT_HEADERS) @$(MKSYMS_SH) $(AWK) $@ $(LIBSMBCLIENT_HEADERS) -$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) +$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) $(LIBSMBCLIENT_SYMS) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \ + @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_THREAD_OBJ) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \ - $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \ + $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) $(PTHREAD_LDFLAGS) \ @SONAMEFLAG@`basename $@` $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME) @@ -2529,7 +2531,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB) @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ) @echo "Linking $@" @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_OBJ) \ - $(LIBREPLACE_LIBS) $(WINBIND_NSS_PTHREAD_LDFLAGS) \ + $(LIBREPLACE_LIBS) $(PTHREAD_LDFLAGS) \ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) $(LIBTALLOC) $(LIBTDB) |