From 602f4635da0935abffdda2a29ec302a775fdbe62 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 18 Feb 2008 19:06:17 +0100 Subject: Get rid of 'INTEGRATED' build of modules - now replaced by 'MERGED_OBJ' (This used to be commit 269cbf84d8b7dbf3bc88adc04ae283dc908af5ac) --- source4/rpc_server/config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/rpc_server') 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 = \ -- cgit