r15338: Fix build of most things with shared libs enabled.

[samba.git] / source4 / torture / config.mk

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index fd93f92758d59773133c70e2da8734d7e9324f02..efbebc549beabf9c49095b58de18a265ea867eeb 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -8,7 +8,7 @@ PUBLIC_PROTO_HEADER = proto.h
 OBJ_FILES = \
                torture.o \
                ui.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                TORTURE_UTIL \
                TORTURE_RAW \
                TORTURE_SMB2 \
@@ -50,8 +50,8 @@ OBJ_FILES = \
                basic/delaywrite.o \
                basic/attr.o \
                basic/properties.o 
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB 
+PUBLIC_DEPENDENCIES = \
+               LIBCLI_SMB 
 # End SUBSYSTEM TORTURE_BASIC
 #################################
 
@@ -84,8 +84,8 @@ OBJ_FILES = \
                raw/acls.o \
                raw/seek.o \
                raw/composite.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB LIBCLI_LSA
+PUBLIC_DEPENDENCIES = \
+               LIBCLI_SMB LIBCLI_LSA
 # End SUBSYSTEM TORTURE_RAW
 #################################
 
@@ -98,12 +98,12 @@ PRIVATE_PROTO_HEADER = \
                com/proto.h
 OBJ_FILES = \
                com/simple.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                com dcom
 
 [MODULE::torture_rpc]
 # TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
-OUTPUT_TYPE = MERGEDOBJ
+OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = torture
 INIT_FUNCTION = torture_rpc_init
 PRIVATE_PROTO_HEADER = \
@@ -147,7 +147,7 @@ OBJ_FILES = \
                rpc/alter_context.o \
                rpc/bench.o \
                rpc/rpc.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                NDR_TABLE RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
                RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
                RPC_NDR_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \
@@ -162,8 +162,8 @@ PRIVATE_PROTO_HEADER = \
                rap/proto.h
 OBJ_FILES = \
                rap/rap.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB
+PUBLIC_DEPENDENCIES = \
+               LIBCLI_SMB
 # End SUBSYSTEM TORTURE_RAP
 #################################
 
@@ -175,8 +175,8 @@ PRIVATE_PROTO_HEADER = \
 OBJ_FILES = \
                auth/ntlmssp.o \
                auth/pac.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB gensec auth
+PUBLIC_DEPENDENCIES = \
+               LIBCLI_SMB gensec auth LIBSAMBA3
 # End SUBSYSTEM TORTURE_AUTH
 #################################
 
@@ -203,7 +203,7 @@ OBJ_FILES = \
                ldap/basic.o \
                ldap/cldap.o \
                ldap/cldapbench.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                LIBCLI_LDAP LIBCLI_CLDAP
 # End SUBSYSTEM TORTURE_LDAP
 #################################
@@ -221,8 +221,8 @@ OBJ_FILES = \
                nbt/winsreplication.o \
                nbt/dgram.o \
                nbt/browse.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB LIBCLI_NBT LIBCLI_WREPL
+PUBLIC_DEPENDENCIES = \
+               LIBCLI_SMB LIBCLI_NBT LIBCLI_WREPL
 # End SUBSYSTEM TORTURE_NBT
 #################################
 
@@ -242,7 +242,7 @@ OBJ_FILES = \
                libnet/libnet_user.o \
                libnet/libnet_share.o \
                libnet/libnet_rpc.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                LIBSAMBA-NET
 # End SUBSYSTEM TORTURE_NET
 #################################
@@ -253,7 +253,7 @@ REQUIRED_SUBSYSTEMS = \
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                smbtorture.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
                torture \
                LIBPOPT \
                POPT_SAMBA \
@@ -268,13 +268,14 @@ MANPAGE = man/smbtorture.1
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                gentest.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
                LIBSAMBA-CONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
                POPT_CREDENTIALS \
-               LIBSMB
+               LIBCLI_SMB \
+               LIBCLI_RAW
 MANPAGE = man/gentest.1
 # End BINARY gentest
 #################################
@@ -285,13 +286,13 @@ MANPAGE = man/gentest.1
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                masktest.o
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_DEPENDENCIES = \
                LIBSAMBA-CONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
                POPT_CREDENTIALS \
-               LIBSMB
+               LIBCLI_SMB
 MANPAGE = man/masktest.1
 # End BINARY masktest
 #################################
@@ -302,8 +303,8 @@ MANPAGE = man/masktest.1
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                locktest.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB \
+PRIVATE_DEPENDENCIES = \
+               LIBCLI_SMB \
                LIBSAMBA-CONFIG \
                LIBSAMBA-UTIL
 MANPAGE = man/locktest.1