From 620d759f49f4b648d0fa4a84e67f1cecbbdd0f06 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 27 Apr 2006 19:50:13 +0000 Subject: r15298: Fix the build using a few hacks in the build system. Recursive dependencies are now forbidden (the build system will bail out if there are any). I've split up auth_sam.c into auth_sam.c and sam.c. Andrew, please rename sam.c / move its contents to whatever/wherever you think suits best. (This used to be commit 6646384aaf3e7fa2aa798c3e564b94b0617ec4d0) --- source4/rpc_server/config.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/rpc_server/config.mk') diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index c187cfdb49..b85700528c 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -123,7 +123,7 @@ PUBLIC_DEPENDENCIES = \ [MODULE::dcerpc_winreg] INIT_FUNCTION = dcerpc_server_winreg_init SUBSYSTEM = dcerpc_server -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ winreg/rpc_winreg.o PUBLIC_DEPENDENCIES = \ @@ -141,7 +141,8 @@ OBJ_FILES = \ PUBLIC_DEPENDENCIES = \ DCERPC_COMMON \ SCHANNELDB \ - NDR_NETLOGON + NDR_NETLOGON \ + auth_sam # End MODULE dcerpc_netlogon ################################################ @@ -164,7 +165,7 @@ PUBLIC_DEPENDENCIES = \ [MODULE::dcerpc_spoolss] INIT_FUNCTION = dcerpc_server_spoolss_init SUBSYSTEM = dcerpc_server -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ spoolss/dcesrv_spoolss.o PUBLIC_DEPENDENCIES = \ @@ -218,8 +219,7 @@ OBJ_FILES = \ PUBLIC_DEPENDENCIES = \ LIBCLI_AUTH \ LIBNDR \ - dcerpc \ - service + dcerpc # # End SUBSYSTEM DCERPC ################################################ -- cgit