summaryrefslogtreecommitdiff
path: root/source4/torture/config.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-27 14:02:46 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-04-27 14:02:46 +0100
commit1e973565b6c0cb738b25a2d9439d5acb441701f4 (patch)
treeb5e2144426df4b44ef17a9a3e66a4f8295faedf3 /source4/torture/config.mk
parent240d959005f5fd80a38b3734b39dd5d6e425a566 (diff)
downloadsamba-1e973565b6c0cb738b25a2d9439d5acb441701f4.tar.gz
samba-1e973565b6c0cb738b25a2d9439d5acb441701f4.tar.bz2
samba-1e973565b6c0cb738b25a2d9439d5acb441701f4.zip
Move subunit infrastructure code into lib/torture.
(This used to be commit 5b44d8121de7735d69e6238a1442aff034a8ebd3)
Diffstat (limited to 'source4/torture/config.mk')
-rw-r--r--source4/torture/config.mk17
1 files changed, 2 insertions, 15 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 1565797609..40f6bbf1ed 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -1,17 +1,3 @@
-# TORTURE subsystem
-[LIBRARY::torture]
-PRIVATE_PROTO_HEADER = proto.h
-PUBLIC_DEPENDENCIES = \
- LIBSAMBA-HOSTCONFIG \
- LIBSAMBA-UTIL \
- LIBTALLOC \
- LIBPOPT
-
-PC_FILES += torture/torture.pc
-torture_OBJ_FILES = $(addprefix torture/, torture.o ui.o)
-
-PUBLIC_HEADERS += torture/torture.h torture/ui.h
-
[SUBSYSTEM::TORTURE_UTIL]
PRIVATE_DEPENDENCIES = LIBCLI_RAW LIBPYTHON smbcalls PROVISION
PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
@@ -255,8 +241,9 @@ PRIVATE_DEPENDENCIES = \
# End BINARY smbtorture
#################################
-smbtorture_OBJ_FILES = torture/smbtorture.o
+smbtorture_OBJ_FILES = torture/smbtorture.o torture/torture.o
+PUBLIC_HEADERS += torture/smbtorture.h
MANPAGES += torture/man/smbtorture.1
#################################