summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-29 02:45:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:09 -0500
commit9220144604e0050cd823fd107c311bf9013cd5a5 (patch)
tree286605a746d941038b4e4ab8775b5520f965aba6 /source4/libcli
parentbe948e60e78cbd75bf0d545418fc02f71fc47b12 (diff)
downloadsamba-9220144604e0050cd823fd107c311bf9013cd5a5.tar.gz
samba-9220144604e0050cd823fd107c311bf9013cd5a5.tar.bz2
samba-9220144604e0050cd823fd107c311bf9013cd5a5.zip
r15313: Fix some dependencies in dso mode
(This used to be commit f0afe9e2ff16515df1b3226b479b19ea3e9c3d0c)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/config.mk10
-rw-r--r--source4/libcli/ldap/config.mk2
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index e0bb50647d..6e7f8b70e3 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -53,8 +53,8 @@ OBJ_FILES = \
nbt/nameregister.o \
nbt/namerefresh.o \
nbt/namerelease.o
-PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
- NDR_SECURITY
+PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
+ NDR_SECURITY SOCKET
[SUBSYSTEM::LIBCLI_DGRAM]
OBJ_FILES = \
@@ -80,7 +80,7 @@ SO_VERSION = 0
DESCRIPTION = WINS Replication client library
OBJ_FILES = \
wrepl/winsrepl.o
-PUBLIC_DEPENDENCIES = NDR_WINSREPL SOCKET LIBEVENTS
+PUBLIC_DEPENDENCIES = NDR_WINSREPL SOCKET LIBCLI_RESOLVE LIBEVENTS
[SUBSYSTEM::LIBCLI_RESOLVE]
PRIVATE_PROTO_HEADER = resolve/proto.h
@@ -109,7 +109,7 @@ PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS
[SUBSYSTEM::LIBSMB]
-PUBLIC_DEPENDENCIES = LIBCLI SOCKET
+PUBLIC_DEPENDENCIES = LIBCLI SOCKET LIBCLI_RESOLVE
PUBLIC_PROTO_HEADER = libcli_proto.h
OBJ_FILES = clireadwrite.o \
cliconnect.o \
@@ -123,7 +123,7 @@ OBJ_FILES = clireadwrite.o \
PRIVATE_PROTO_HEADER = raw/raw_proto.h
PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE
PUBLIC_DEPENDENCIES = LIBCLI_RAW_KRB5
-LDFLAGS = -lcli_smb_composite
+LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT)
OBJ_FILES = raw/rawfile.o \
raw/smb_signing.o \
raw/clisocket.o \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index ec5c48b48c..167a07eddd 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -11,7 +11,7 @@ OBJ_FILES = ldap.o \
ldap_ildap.o \
ldap_controls.o
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET
-PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE SOCKET NDR_SAMR LIBTLS ASN1_UTIL
+PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE SOCKET LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL
#PRIVATE_DEPENDENCIES = gensec
# End SUBSYSTEM LIBCLI_LDAP
#################################