diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 19:06:17 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 19:06:17 +0100 |
| commit | 602f4635da0935abffdda2a29ec302a775fdbe62 (patch) | |
| tree | 9629af40ff9f530b43578d0e40f3e83a2be43cfc /source4/torture/config.mk | |
| parent | 6e0522c3cae9c99b589db67727ee1256c6da82ef (diff) | |
| download | samba-602f4635da0935abffdda2a29ec302a775fdbe62.tar.gz samba-602f4635da0935abffdda2a29ec302a775fdbe62.tar.bz2 samba-602f4635da0935abffdda2a29ec302a775fdbe62.zip | |
Get rid of 'INTEGRATED' build of modules - now replaced by 'MERGED_OBJ'
(This used to be commit 269cbf84d8b7dbf3bc88adc04ae283dc908af5ac)
Diffstat (limited to 'source4/torture/config.mk')
| -rw-r--r-- | source4/torture/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 7ab4658dc1..a11b94b639 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -113,7 +113,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 = \ |