diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-17 16:45:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:36 -0500 |
| commit | c67fd3f0e834841d4e7d13b5517f45eec8d1085c (patch) | |
| tree | ae64621bdd578db8b253bdaa71c91a7656abd4ca /source4/torture/config.mk | |
| parent | d7254a36158b4355d711fa64c1f804b86aacbba1 (diff) | |
| download | samba-c67fd3f0e834841d4e7d13b5517f45eec8d1085c.tar.gz samba-c67fd3f0e834841d4e7d13b5517f45eec8d1085c.tar.bz2 samba-c67fd3f0e834841d4e7d13b5517f45eec8d1085c.zip | |
r14524: Make TORTURE_NET a separate module
Add new header for torture utility functions, so torture.h doesn't
need to depend on the SMB libraries
(This used to be commit ab162bcafc666f226332d4678b0875139a0d65c2)
Diffstat (limited to 'source4/torture/config.mk')
| -rw-r--r-- | source4/torture/config.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk index af80699093..5de3692f05 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -3,9 +3,9 @@ PUBLIC_HEADERS = torture.h PUBLIC_PROTO_HEADER = proto.h OBJ_FILES = \ - torture.o \ - torture_util.o + torture.o REQUIRED_SUBSYSTEMS = \ + TORTURE_UTIL \ TORTURE_RAW \ TORTURE_SMB2 \ TORTURE_RAP \ @@ -14,10 +14,13 @@ REQUIRED_SUBSYSTEMS = \ TORTURE_NBENCH \ TORTURE_LDAP \ TORTURE_NBT \ - TORTURE_NET \ CONFIG \ LIBBASIC +[SUBSYSTEM::TORTURE_UTIL] +OBJ_FILES = torture_util.o +PUBLIC_PROTO_HEADER = util.h + ################################# # Start SUBSYSTEM TORTURE_BASIC [MODULE::TORTURE_BASIC] @@ -146,7 +149,7 @@ REQUIRED_SUBSYSTEMS = \ RPC_NDR_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \ RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \ RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \ - RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER + RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBNET ################################# # Start SUBSYSTEM TORTURE_RAP @@ -221,10 +224,13 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start SUBSYSTEM TORTURE_NET -[SUBSYSTEM::TORTURE_NET] +[MODULE::TORTURE_NET] +SUBSYSTEM = torture +INIT_FUNCTION = torture_net_init PRIVATE_PROTO_HEADER = \ libnet/proto.h OBJ_FILES = \ + libnet/libnet.o \ libnet/userinfo.o \ libnet/userman.o \ libnet/domain.o \ |