Move tdr to top-level.

[ira/wip.git] / source4 / torture / local / config.mk

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 79df834525563fec5c57dc14cacf934f16729a7c..e13056190a2e024eda8c125946ff3ae8133329cb 100644 (file)
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -2,6 +2,7 @@
 # Start SUBSYSTEM TORTURE_LOCAL
 [MODULE::TORTURE_LOCAL]
 SUBSYSTEM = smbtorture
+OUTPUT_TYPE = MERGED_OBJ
 INIT_FUNCTION = torture_local_init
 PRIVATE_DEPENDENCIES = \
                RPC_NDR_ECHO \
@@ -13,13 +14,15 @@ PRIVATE_DEPENDENCIES = \
                TORTURE_AUTH \
                TORTURE_UTIL \
                TORTURE_NDR \
+               TORTURE_LIBCRYPTO \
                share \
-               torture_registry
+               torture_registry \
+               PROVISION
 # End SUBSYSTEM TORTURE_LOCAL
 #################################
 
 TORTURE_LOCAL_OBJ_FILES = \
-               $(torturesrcdir)/../lib/charset/tests/iconv.o \
+               $(torturesrcdir)/../../lib/util/charset/tests/iconv.o \
                $(torturesrcdir)/../../lib/talloc/testsuite.o \
                $(torturesrcdir)/../../lib/replace/test/getifaddrs.o \
                $(torturesrcdir)/../../lib/replace/test/os2_delete.o \
@@ -35,13 +38,14 @@ TORTURE_LOCAL_OBJ_FILES = \
                $(torturesrcdir)/../../lib/util/tests/strlist.o \
                $(torturesrcdir)/../../lib/util/tests/str.o \
                $(torturesrcdir)/../../lib/util/tests/time.o \
+               $(torturesrcdir)/../../lib/util/tests/data_blob.o \
                $(torturesrcdir)/../../lib/util/tests/file.o \
                $(torturesrcdir)/../../lib/util/tests/genrand.o \
                $(torturesrcdir)/../../lib/compression/testsuite.o \
-               $(torturesrcdir)/../lib/charset/tests/charset.o \
+               $(torturesrcdir)/../../lib/util/charset/tests/charset.o \
                $(torturesrcdir)/../libcli/security/tests/sddl.o \
-               $(torturesrcdir)/../lib/tdr/testsuite.o \
-               $(torturesrcdir)/../lib/events/testsuite.o \
+               ../lib/tdr/testsuite.o \
+               $(torturesrcdir)/../../lib/tevent/testsuite.o \
                $(torturesrcdir)/../param/tests/share.o \
                $(torturesrcdir)/../param/tests/loadparm.o \
                $(torturesrcdir)/../auth/credentials/tests/simple.o \