summaryrefslogtreecommitdiff
path: root/source4/rpc_server
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 19:06:17 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 19:06:17 +0100
commit602f4635da0935abffdda2a29ec302a775fdbe62 (patch)
tree9629af40ff9f530b43578d0e40f3e83a2be43cfc /source4/rpc_server
parent6e0522c3cae9c99b589db67727ee1256c6da82ef (diff)
downloadsamba-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/rpc_server')
-rw-r--r--source4/rpc_server/config.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index d794b9470d..0032a867d1 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -108,7 +108,7 @@ PRIVATE_DEPENDENCIES = \
[MODULE::dcerpc_winreg]
INIT_FUNCTION = dcerpc_server_winreg_init
SUBSYSTEM = dcerpc_server
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
OBJ_FILES = \
winreg/rpc_winreg.o
PRIVATE_DEPENDENCIES = \
@@ -155,7 +155,7 @@ PRIVATE_DEPENDENCIES = \
[MODULE::dcerpc_spoolss]
INIT_FUNCTION = dcerpc_server_spoolss_init
SUBSYSTEM = dcerpc_server
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
OBJ_FILES = \
spoolss/dcesrv_spoolss.o
PRIVATE_DEPENDENCIES = \