summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 22:25:19 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 22:25:19 +0100
commitb4017955e19723e48b41b70c7ba313dcfcda5eb9 (patch)
tree138d37f4c9abc2dcecd38a6ba4e5c539b4927421 /source4/torture
parent1131d4c2545355ef793e468810655c0f72828368 (diff)
parentb136033421eb045b28f5928e4d2f9604cf704690 (diff)
downloadsamba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.gz
samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.bz2
samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.zip
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts: source/build/smb_build/input.pm source/build/smb_build/main.pl source/build/smb_build/makefile.pm (This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/config.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 7ab4658dc1..a1975a6caf 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -95,8 +95,8 @@ PRIVATE_DEPENDENCIES = \
# End SUBSYSTEM TORTURE_RAW
#################################
-include smb2/config.mk
-include winbind/config.mk
+mkinclude smb2/config.mk
+mkinclude winbind/config.mk
[SUBSYSTEM::TORTURE_NDR]
PRIVATE_PROTO_HEADER = ndr/proto.h
@@ -113,7 +113,7 @@ OBJ_FILES = ndr/ndr.o \
[MODULE::torture_rpc]
# TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
-#OUTPUT_TYPE = INTEGRATED
+#OUTPUT_TYPE = MERGED_OBJ
SUBSYSTEM = torture
INIT_FUNCTION = torture_rpc_init
PRIVATE_PROTO_HEADER = \
@@ -200,7 +200,7 @@ PRIVATE_DEPENDENCIES = \
# End SUBSYSTEM TORTURE_AUTH
#################################
-include local/config.mk
+mkinclude local/config.mk
#################################
# Start MODULE TORTURE_NBENCH