diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-19 14:45:23 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-19 14:45:23 +1100 |
| commit | e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1 (patch) | |
| tree | 643566bbcf1312cd9ae1fed9e235d702c7281a8f /source4/torture | |
| parent | 5842df9d0fb71430d1bcda1c4c748589b38ecb00 (diff) | |
| parent | 9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd (diff) | |
| download | samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.gz samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.bz2 samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/config.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 32085400b7..82e32e1ece 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -11,7 +11,8 @@ OBJ_FILES = \ PUBLIC_DEPENDENCIES = \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - LIBTALLOC + LIBTALLOC \ + LIBPOPT [SUBSYSTEM::TORTURE_UTIL] OBJ_FILES = util_smb.o util_provision.o @@ -95,8 +96,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 +114,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 +201,7 @@ PRIVATE_DEPENDENCIES = \ # End SUBSYSTEM TORTURE_AUTH ################################# -include local/config.mk +mkinclude local/config.mk ################################# # Start MODULE TORTURE_NBENCH |