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 b57093178e6ccca23ad60212d4947e363812f7f7..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,34 +14,38 @@ 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)/../../talloc/testsuite.o \
-               $(torturesrcdir)/../lib/replace/test/getifaddrs.o \
-               $(torturesrcdir)/../lib/replace/test/os2_delete.o \
-               $(torturesrcdir)/../lib/replace/test/strptime.o \
-               $(torturesrcdir)/../lib/replace/test/testsuite.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 \
+               $(torturesrcdir)/../../lib/replace/test/strptime.o \
+               $(torturesrcdir)/../../lib/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/util/tests/idtree.o \
                $(torturesrcdir)/../lib/socket/testsuite.o \
-               $(torturesrcdir)/../lib/socket_wrapper/testsuite.o \
+               $(torturesrcdir)/../../lib/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)/../lib/compression/testsuite.o \
-               $(torturesrcdir)/../lib/charset/tests/charset.o \
+               $(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/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 \