summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2009-10-04 01:33:12 +0200
committerBjörn Jacke <bj@sernet.de>2009-10-04 02:20:21 +0200
commit71229dde1e9b4b0bd3e690c6c9e5e5913c90ffe8 (patch)
tree7bf505b2edcbb7296e9a443c25f99d27a2170ff3
parenta45716400dd9a219b3fde9ef74004c205a7a8fe4 (diff)
downloadsamba-71229dde1e9b4b0bd3e690c6c9e5e5913c90ffe8.tar.gz
samba-71229dde1e9b4b0bd3e690c6c9e5e5913c90ffe8.tar.bz2
samba-71229dde1e9b4b0bd3e690c6c9e5e5913c90ffe8.zip
s3:Makefile: another attempt to fix the netapi dependency
in the dependencies we always used a variable that was not jet defined.
-rw-r--r--source3/Makefile.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 298e92bba8..d3334f067f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -80,6 +80,7 @@ LIBTALLOC=@LIBTALLOC_STATIC@ @LIBTALLOC_SHARED@
LIBTALLOC_LIBS=@LIBTALLOC_LIBS@
LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@
LIBTDB_LIBS=@LIBTDB_LIBS@
+LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@
LIBNETAPI_LIBS=@LIBNETAPI_LIBS@
LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
@@ -1566,7 +1567,7 @@ bin/smbclient@EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
-bin/net@EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) @LIBWBCLIENT_TARGET@ @LIBNETAPI_TARGET@
+bin/net@EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) @LIBWBCLIENT_TARGET@ $(LIBNETAPI)
@echo Linking $@
@$(CC) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
$(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
@@ -2169,7 +2170,6 @@ LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
LIBNETAPI_SOVER=@LIBNETAPI_SOVER@
LIBNETAPI_SHARED_TARGET_SONAME=$(LIBNETAPI_SHARED_TARGET).$(LIBNETAPI_SOVER)
LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@
-LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@
LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.@SYMSEXT@
LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
@@ -2228,7 +2228,6 @@ showlibnetapi:
@echo ""
@echo "LIBNETAPI_SHARED = @LIBNETAPI_SHARED@"
@echo "LIBNETAPI_STATIC = @LIBNETAPI_STATIC@"
- @echo "LIBNETAPI_TARGET = @LIBNETAPI_TARGET@"
@echo "LIBNETAPI_LIBS = $(LIBNETAPI_LIBS)"
@echo ""
@echo "LIBNETAPI_SHARED_TARGET = $(LIBNETAPI_SHARED_TARGET)"