summaryrefslogtreecommitdiff
path: root/source4/torture/config.mk
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture/config.mk')
-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