diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-12 02:49:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:29 -0500 |
| commit | c81f2930a2df7cbd72a28e167ac522d2638661ea (patch) | |
| tree | f97c61ea9bad4deb9904ac4266563f60f3242a4d /source4/torture | |
| parent | fff74b4bca6f050713a7558f2dcbd3b1821d3d6b (diff) | |
| download | samba-c81f2930a2df7cbd72a28e167ac522d2638661ea.tar.gz samba-c81f2930a2df7cbd72a28e167ac522d2638661ea.tar.bz2 samba-c81f2930a2df7cbd72a28e167ac522d2638661ea.zip | |
r19676: Fix some more dependencies.
(This used to be commit 8768bec81f57131a0c9754e8121b345c0be4a5d0)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/config.mk | 16 | ||||
| -rw-r--r-- | source4/torture/local/config.mk | 1 |
2 files changed, 6 insertions, 11 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk index c093ea7b97..de74103b46 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -7,10 +7,12 @@ PUBLIC_HEADERS = torture.h ui.h PUBLIC_PROTO_HEADER = proto.h OBJ_FILES = \ torture.o \ - subunit.o + subunit.o \ + ui.o PUBLIC_DEPENDENCIES = \ LIBSAMBA-CONFIG \ - LIBSAMBA-UTIL + LIBSAMBA-UTIL \ + LIBTALLOC [SUBSYSTEM::TORTURE_UTIL] OBJ_FILES = util.o util_smb.o @@ -18,11 +20,6 @@ PRIVATE_DEPENDENCIES = LIBCLI_RAW 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] @@ -277,7 +274,6 @@ PRIVATE_DEPENDENCIES = \ LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS \ - TORTURE_UI \ dcerpc \ LIBCLI_SMB \ SMBREADLINE @@ -327,9 +323,9 @@ INSTALLDIR = BINDIR OBJ_FILES = \ locktest.o PRIVATE_DEPENDENCIES = \ + LIBSAMBA-UTIL \ LIBCLI_SMB \ - LIBSAMBA-CONFIG \ - LIBSAMBA-UTIL + LIBSAMBA-CONFIG MANPAGE = man/locktest.1 # End BINARY locktest ################################# diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 9e1fe32147..f41ce8ac5b 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -38,7 +38,6 @@ PUBLIC_DEPENDENCIES = \ registry \ LIBCRYPTO \ POPT_CREDENTIALS \ - TORTURE_UI \ TORTURE_AUTH \ TORTURE_UTIL # End SUBSYSTEM TORTURE_LOCAL |