r13924: Split more prototypes out of include/proto.h + initial work on header

[samba.git] / source4 / rpc_server / config.mk

diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 5456acb4cd69b6b52f6fc35658ec30e6c62af1ee..ced4701e0998412b6067b0a1976555ae7902d9e4 100644 (file)
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -3,7 +3,8 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
-ADD_OBJ_FILES = \
+PRIVATE_PROTO_HEADER = common/proto.h
+OBJ_FILES = \
                common/server_info.o \
                common/share_info.o
 #
@@ -15,8 +16,8 @@ ADD_OBJ_FILES = \
 [MODULE::dcerpc_dcom]
 ENABLE = NO
 INIT_FUNCTION = dcerpc_server_dcom_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                dcom/oxidresolver.o \
                dcom/rot.o \
                dcom/rodb.o \
@@ -32,8 +33,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_rpcecho
 [MODULE::dcerpc_rpcecho]
 INIT_FUNCTION = dcerpc_server_rpcecho_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                echo/rpc_echo.o
 REQUIRED_SUBSYSTEMS = NDR_ECHO
 # End MODULE dcerpc_rpcecho
@@ -43,8 +44,8 @@ REQUIRED_SUBSYSTEMS = NDR_ECHO
 # Start MODULE dcerpc_epmapper
 [MODULE::dcerpc_epmapper]
 INIT_FUNCTION = dcerpc_server_epmapper_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                epmapper/rpc_epmapper.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 # End MODULE dcerpc_epmapper
@@ -54,8 +55,8 @@ REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 # Start MODULE dcerpc_remote
 [MODULE::dcerpc_remote]
 INIT_FUNCTION = dcerpc_server_remote_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                remote/dcesrv_remote.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB NDR_ALL
@@ -66,8 +67,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_srvsvc
 [MODULE::dcerpc_srvsvc]
 INIT_FUNCTION = dcerpc_server_srvsvc_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                srvsvc/dcesrv_srvsvc.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON NDR_SRVSVC
@@ -78,8 +79,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_wkssvc
 [MODULE::dcerpc_wkssvc]
 INIT_FUNCTION = dcerpc_server_wkssvc_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                wkssvc/dcesrv_wkssvc.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON NDR_WKSSVC
@@ -90,8 +91,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_unixinfo
 [MODULE::dcerpc_unixinfo]
 INIT_FUNCTION = dcerpc_server_unixinfo_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                unixinfo/dcesrv_unixinfo.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
@@ -103,10 +104,10 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_samr
 [MODULE::dcerpc_samr]
 INIT_FUNCTION = dcerpc_server_samr_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               samr/dcesrv_samr.o
-ADD_OBJ_FILES = \
+PRIVATE_PROTO_HEADER = samr/proto.h
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               samr/dcesrv_samr.o \
                samr/samr_password.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
@@ -119,8 +120,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_winreg
 [MODULE::dcerpc_winreg]
 INIT_FUNCTION = dcerpc_server_winreg_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OUTPUT_TYPE = MERGEDOBJ
+OBJ_FILES = \
                winreg/rpc_winreg.o
 REQUIRED_SUBSYSTEMS = \
                REGISTRY NDR_WINREG
@@ -131,8 +133,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_netlogon
 [MODULE::dcerpc_netlogon]
 INIT_FUNCTION = dcerpc_server_netlogon_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                netlogon/dcerpc_netlogon.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
@@ -145,8 +147,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_lsa
 [MODULE::dcerpc_lsarpc]
 INIT_FUNCTION = dcerpc_server_lsarpc_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                lsa/dcesrv_lsa.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
@@ -159,8 +161,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_spoolss
 [MODULE::dcerpc_spoolss]
 INIT_FUNCTION = dcerpc_server_spoolss_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OUTPUT_TYPE = MERGEDOBJ
+OBJ_FILES = \
                spoolss/dcesrv_spoolss.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
@@ -173,8 +176,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_drsuapi
 [MODULE::dcerpc_drsuapi]
 INIT_FUNCTION = dcerpc_server_drsuapi_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                drsuapi/dcesrv_drsuapi.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
@@ -187,8 +190,8 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_dssetup
 [MODULE::dcerpc_dssetup]
 INIT_FUNCTION = dcerpc_server_dssetup_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
                dssetup/dcesrv_dssetup.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
@@ -198,17 +201,18 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 
 ################################################
-# Start SUBSYSTEM DCERPC
-[SUBSYSTEM::DCERPC]
-INIT_OBJ_FILES = \
-               dcerpc_server.o
-ADD_OBJ_FILES = \
+# Start SUBSYSTEM DCERPC_SERVER
+[SUBSYSTEM::DCERPC_SERVER]
+PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
+OBJ_FILES = \
+               dcerpc_server.o \
                dcerpc_sock.o \
                dcesrv_auth.o \
                handles.o
 REQUIRED_SUBSYSTEMS = \
                LIBCLI_AUTH \
-               LIBNDR
+               LIBNDR \
+               LIBDCERPC
 #
 # End SUBSYSTEM DCERPC
 ################################################