summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-27 19:50:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:04 -0500
commit620d759f49f4b648d0fa4a84e67f1cecbbdd0f06 (patch)
tree15a768135a197cdd7b3acd369c029ce9248e9012 /source4/torture
parent710ea949886dd57c66dc6d397e0ea41c89736107 (diff)
downloadsamba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.gz
samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.bz2
samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.zip
r15298: Fix the build using a few hacks in the build system.
Recursive dependencies are now forbidden (the build system will bail out if there are any). I've split up auth_sam.c into auth_sam.c and sam.c. Andrew, please rename sam.c / move its contents to whatever/wherever you think suits best. (This used to be commit 6646384aaf3e7fa2aa798c3e564b94b0617ec4d0)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index bf5b6ef2fb..09790a686d 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -103,7 +103,7 @@ PUBLIC_DEPENDENCIES = \
[MODULE::torture_rpc]
# TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
-OUTPUT_TYPE = MERGEDOBJ
+OUTPUT_TYPE = INTEGRATED
SUBSYSTEM = torture
INIT_FUNCTION = torture_rpc_init
PRIVATE_PROTO_HEADER = \