Merge branch 'singlecompression' into single

[metze/samba/wip.git] / source4 / torture / local / config.mk

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 69d4ef2d2c7ef6213d2a9753c20f611a24adec0d..54cbdae837a89a6396d50c9a81895d639dda3391 100644 (file)
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -1,49 +1,52 @@
 #################################
 # Start SUBSYSTEM TORTURE_LOCAL
 [MODULE::TORTURE_LOCAL]
-SUBSYSTEM = torture
+SUBSYSTEM = smbtorture
 INIT_FUNCTION = torture_local_init
-PRIVATE_PROTO_HEADER = \
-               proto.h
-OBJ_FILES = \
-               iconv.o \
-               ../../lib/crypto/md4test.o \
-               ../../lib/crypto/md5test.o \
-               ../../lib/crypto/hmacmd5test.o \
-               ../../lib/crypto/sha1test.o \
-               ../../lib/crypto/hmacsha1test.o \
-               ../../lib/talloc/testsuite.o \
-               ../../lib/replace/test/os2_delete.o \
-               ../../lib/replace/test/testsuite.o \
-               messaging.o \
-               ../../librpc/tests/binding_string.o \
-               ../../lib/util/tests/idtree.o \
-               ../../lib/socket/testsuite.o \
-               ../../lib/socket_wrapper/testsuite.o \
-               irpc.o \
-               ../../lib/registry/tests/generic.o \
-               resolve.o \
-               ../../lib/util/tests/strlist.o \
-               ../../lib/util/tests/file.o \
-               ../../lib/util/tests/genrand.o \
-               sddl.o \
-               ../../lib/tdr/testsuite.o \
-               event.o \
-               local.o \
-               dbspeed.o \
-               torture.o
-PUBLIC_DEPENDENCIES = \
+PRIVATE_DEPENDENCIES = \
                RPC_NDR_ECHO \
                TDR \
                LIBCLI_SMB \
                MESSAGING \
                ICONV \
-               registry \
-               LIBCRYPTO \
                POPT_CREDENTIALS \
                TORTURE_AUTH \
-               TORTURE_UTIL
-PRIVATE_DEPENDENCIES = TORTURE_NDR
+               TORTURE_UTIL \
+               TORTURE_NDR \
+               share \
+               torture_registry
 # End SUBSYSTEM TORTURE_LOCAL
 #################################
 
+TORTURE_LOCAL_OBJ_FILES = \
+               $(torturesrcdir)/../lib/charset/tests/iconv.o \
+               $(torturesrcdir)/../../talloc/testsuite.o \
+               $(torturesrcdir)/../../replace/test/getifaddrs.o \
+               $(torturesrcdir)/../../replace/test/os2_delete.o \
+               $(torturesrcdir)/../../replace/test/strptime.o \
+               $(torturesrcdir)/../../replace/test/testsuite.o \
+               $(torturesrcdir)/../lib/messaging/tests/messaging.o \
+               $(torturesrcdir)/../lib/messaging/tests/irpc.o \
+               $(torturesrcdir)/../librpc/tests/binding_string.o \
+               $(torturesrcdir)/../lib/util/tests/idtree.o \
+               $(torturesrcdir)/../lib/socket/testsuite.o \
+               $(torturesrcdir)/../../socket_wrapper/testsuite.o \
+               $(torturesrcdir)/../libcli/resolve/testsuite.o \
+               $(torturesrcdir)/../lib/util/tests/strlist.o \
+               $(torturesrcdir)/../lib/util/tests/str.o \
+               $(torturesrcdir)/../lib/util/tests/file.o \
+               $(torturesrcdir)/../lib/util/tests/genrand.o \
+               $(torturesrcdir)/../../compression/testsuite.o \
+               $(torturesrcdir)/../lib/charset/tests/charset.o \
+               $(torturesrcdir)/../libcli/security/tests/sddl.o \
+               $(torturesrcdir)/../lib/tdr/testsuite.o \
+               $(torturesrcdir)/../lib/events/testsuite.o \
+               $(torturesrcdir)/../param/tests/share.o \
+               $(torturesrcdir)/../param/tests/loadparm.o \
+               $(torturesrcdir)/../auth/credentials/tests/simple.o \
+               $(torturesrcdir)/local/local.o \
+               $(torturesrcdir)/local/dbspeed.o \
+               $(torturesrcdir)/local/torture.o
+
+
+$(eval $(call proto_header_template,$(torturesrcdir)/local/proto.h,$(TORTURE_LOCAL_OBJ_FILES:.o=.c)))