summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-12-29 23:14:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:00 -0500
commit46aa296cc94933082dbb4b9b2b1ed210a600ad2d (patch)
tree4ff030226a04636e81e4e08009f817803e78f4a5 /source4/libcli
parente7303fc26737486b81978e3caa77dc202fac45fa (diff)
downloadsamba-46aa296cc94933082dbb4b9b2b1ed210a600ad2d.tar.gz
samba-46aa296cc94933082dbb4b9b2b1ed210a600ad2d.tar.bz2
samba-46aa296cc94933082dbb4b9b2b1ed210a600ad2d.zip
r12592: Remove some useless dependencies
(This used to be commit ca8db1a0cd77682ac2c6dc4718f5d753a4fcc4db)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/config.mk6
-rw-r--r--source4/libcli/ldap/config.mk3
-rw-r--r--source4/libcli/security/config.mk21
3 files changed, 8 insertions, 22 deletions
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index c3ebebed41..fb04c32d85 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -30,6 +30,9 @@ OBJ_FILES = \
smb_composite/fsinfo.o
REQUIRED_SUBSYSTEMS = LIBCLI_COMPOSITE
+[SUBSYSTEM::NDR_NBT_BUF]
+OBJ_FILES = nbt/nbtname.o\
+
[LIBRARY::LIBCLI_NBT]
MAJOR_VERSION = 0
MINOR_VERSION = 0
@@ -37,14 +40,13 @@ RELEASE_VERSION = 1
DESCRIPTION = NetBios over TCP/IP client library
PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
OBJ_FILES = \
- nbt/nbtname.o \
nbt/nbtsocket.o \
nbt/namequery.o \
nbt/nameregister.o \
nbt/namerefresh.o \
nbt/namerelease.o
REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \
- LIB_SECURITY_NDR
+ NDR_SECURITY
[SUBSYSTEM::LIBCLI_DGRAM]
OBJ_FILES = \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index b9fcb20038..912cb133bf 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -8,6 +8,7 @@ OBJ_FILES = ldap.o \
ldap_msg.o \
ldap_ndr.o \
ldap_ildap.o
-REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET RPC_NDR_SAMR LIBTLS
+REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET NDR_SAMR LIBTLS \
+ LIBPACKET
# End SUBSYSTEM LIBCLI_LDAP
#################################
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 368a56d2b4..a8de499531 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -1,20 +1,4 @@
#################################
-# Start SUBSYSTEM LIB_SECURITY_NDR_HELPER
-[SUBSYSTEM::LIB_SECURITY_NDR_HELPER]
-OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o
-# End SUBSYSTEM LIB_SECURITY_NDR_HELPER
-#################################
-
-#################################
-# Start SUBSYSTEM LIB_SECURITY_NDR
-[SUBSYSTEM::LIB_SECURITY_NDR]
-OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o
-NOPROTO = YES
-REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER
-# End SUBSYSTEM LIB_SECURITY_NDR
-#################################
-
-#################################
# Start SUBSYSTEM LIB_SECURITY
[SUBSYSTEM::LIB_SECURITY]
OBJ_FILES = security_token.o \
@@ -22,8 +6,7 @@ OBJ_FILES = security_token.o \
dom_sid.o \
access_check.o \
privilege.o \
- sddl.o \
- ../../librpc/ndr/ndr_sec.o
-REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR
+ sddl.o
+REQUIRED_SUBSYSTEMS = NDR_SECURITY
# End SUBSYSTEM LIB_SECURITY
#################################