summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-22 20:07:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:28 -0500
commit495652fe24da009bdef839be9eb543837ecaab04 (patch)
treee50d5d4cd0044db664cd086911d3a98f5890006c
parente982523bc0581906741ad45dea4126ae8a11731c (diff)
downloadsamba-495652fe24da009bdef839be9eb543837ecaab04.tar.gz
samba-495652fe24da009bdef839be9eb543837ecaab04.tar.bz2
samba-495652fe24da009bdef839be9eb543837ecaab04.zip
r15821: Fix static library build.
(This used to be commit d9d8f93af12c08d3b66c0bec014016ea8ee11166)
-rw-r--r--source4/torture/config.mk8
-rw-r--r--source4/torture/local/config.mk3
2 files changed, 8 insertions, 3 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index d28fefa2ce..c674cd82f1 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -6,8 +6,7 @@ VERSION = 0.0.1
PUBLIC_HEADERS = torture.h
PUBLIC_PROTO_HEADER = proto.h
OBJ_FILES = \
- torture.o \
- ui.o
+ torture.o
PUBLIC_DEPENDENCIES = \
TORTURE_UTIL \
TORTURE_RAW \
@@ -26,6 +25,11 @@ OBJ_FILES = torture_util.o
PUBLIC_PROTO_HEADER = util.h
PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
+[SUBSYSTEM::TORTURE_UI]
+OBJ_FILES = ui.o
+PUBLIC_HEADERS = ui.h
+PUBLIC_DEPENDENCIES = LIBTALLOC
+
#################################
# Start SUBSYSTEM TORTURE_BASIC
[MODULE::TORTURE_BASIC]
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 9806a10062..c795df1ff8 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -23,7 +23,8 @@ PUBLIC_DEPENDENCIES = \
MESSAGING \
ICONV \
registry \
- POPT_CREDENTIALS
+ POPT_CREDENTIALS \
+ TORTURE_UI
# End SUBSYSTEM TORTURE_LOCAL
#################################