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 a3dfd3de516540cc754c8ac27febc39808163289..ced4701e0998412b6067b0a1976555ae7902d9e4 100644 (file)
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -3,9 +3,10 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
-ADD_OBJ_FILES = \
-               rpc_server/common/server_info.o \
-               rpc_server/common/share_info.o
+PRIVATE_PROTO_HEADER = common/proto.h
+OBJ_FILES = \
+               common/server_info.o \
+               common/share_info.o
 #
 # End SUBSYSTEM DCERPC_COMMON
 ################################################
@@ -15,18 +16,16 @@ ADD_OBJ_FILES = \
 [MODULE::dcerpc_dcom]
 ENABLE = NO
 INIT_FUNCTION = dcerpc_server_dcom_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/dcom/oxidresolver.o \
-               rpc_server/dcom/rot.o \
-               rpc_server/dcom/rodb.o \
-               rpc_server/dcom/remact.o \
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               dcom/oxidresolver.o \
+               dcom/rot.o \
+               dcom/rodb.o \
+               dcom/remact.o \
                librpc/gen_ndr/ndr_dcom_d.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
-               NDR_OXIDRESOLVER \
-               NDR_REMACT \
-               LIBCOM
+               DCOM
 # End MODULE dcerpc_dcom
 ################################################
 
@@ -34,9 +33,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_rpcecho
 [MODULE::dcerpc_rpcecho]
 INIT_FUNCTION = dcerpc_server_rpcecho_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/echo/rpc_echo.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               echo/rpc_echo.o
 REQUIRED_SUBSYSTEMS = NDR_ECHO
 # End MODULE dcerpc_rpcecho
 ################################################
@@ -45,9 +44,9 @@ REQUIRED_SUBSYSTEMS = NDR_ECHO
 # Start MODULE dcerpc_epmapper
 [MODULE::dcerpc_epmapper]
 INIT_FUNCTION = dcerpc_server_epmapper_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/epmapper/rpc_epmapper.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               epmapper/rpc_epmapper.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 # End MODULE dcerpc_epmapper
 ################################################
@@ -56,9 +55,9 @@ REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 # Start MODULE dcerpc_remote
 [MODULE::dcerpc_remote]
 INIT_FUNCTION = dcerpc_server_remote_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/remote/dcesrv_remote.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               remote/dcesrv_remote.o
 REQUIRED_SUBSYSTEMS = \
                LIBSMB NDR_ALL
 # End MODULE dcerpc_remote
@@ -68,9 +67,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_srvsvc
 [MODULE::dcerpc_srvsvc]
 INIT_FUNCTION = dcerpc_server_srvsvc_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/srvsvc/dcesrv_srvsvc.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               srvsvc/dcesrv_srvsvc.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON NDR_SRVSVC
 # End MODULE dcerpc_srvsvc
@@ -80,23 +79,36 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_wkssvc
 [MODULE::dcerpc_wkssvc]
 INIT_FUNCTION = dcerpc_server_wkssvc_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/wkssvc/dcesrv_wkssvc.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               wkssvc/dcesrv_wkssvc.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON NDR_WKSSVC
 # End MODULE dcerpc_wkssvc
 ################################################
 
+################################################
+# Start MODULE dcerpc_unixinfo
+[MODULE::dcerpc_unixinfo]
+INIT_FUNCTION = dcerpc_server_unixinfo_init
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               unixinfo/dcesrv_unixinfo.o
+REQUIRED_SUBSYSTEMS = \
+               DCERPC_COMMON \
+               NDR_UNIXINFO
+# End MODULE dcerpc_unixinfo
+################################################
+
 ################################################
 # Start MODULE dcerpc_samr
 [MODULE::dcerpc_samr]
 INIT_FUNCTION = dcerpc_server_samr_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/samr/dcesrv_samr.o
-ADD_OBJ_FILES = \
-               rpc_server/samr/samr_password.o
+PRIVATE_PROTO_HEADER = samr/proto.h
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               samr/dcesrv_samr.o \
+               samr/samr_password.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
                DCERPC_COMMON \
@@ -108,9 +120,10 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_winreg
 [MODULE::dcerpc_winreg]
 INIT_FUNCTION = dcerpc_server_winreg_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/winreg/rpc_winreg.o
+SUBSYSTEM = DCERPC_SERVER
+OUTPUT_TYPE = MERGEDOBJ
+OBJ_FILES = \
+               winreg/rpc_winreg.o
 REQUIRED_SUBSYSTEMS = \
                REGISTRY NDR_WINREG
 # End MODULE dcerpc_winreg
@@ -120,9 +133,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_netlogon
 [MODULE::dcerpc_netlogon]
 INIT_FUNCTION = dcerpc_server_netlogon_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/netlogon/dcerpc_netlogon.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               netlogon/dcerpc_netlogon.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
                SCHANNELDB \
@@ -134,9 +147,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_lsa
 [MODULE::dcerpc_lsarpc]
 INIT_FUNCTION = dcerpc_server_lsarpc_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/lsa/dcesrv_lsa.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               lsa/dcesrv_lsa.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
                DCERPC_COMMON \
@@ -148,25 +161,24 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_spoolss
 [MODULE::dcerpc_spoolss]
 INIT_FUNCTION = dcerpc_server_spoolss_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/spoolss/dcesrv_spoolss.o \
-               rpc_server/spoolss/spoolssdb.o
+SUBSYSTEM = DCERPC_SERVER
+OUTPUT_TYPE = MERGEDOBJ
+OBJ_FILES = \
+               spoolss/dcesrv_spoolss.o
 REQUIRED_SUBSYSTEMS = \
                DCERPC_COMMON \
-               NDR_SPOOLSS
-# End MODULE dcerpc_lsa
+               NDR_SPOOLSS \
+               NTPTR
+# End MODULE dcerpc_spoolss
 ################################################
 
 ################################################
 # Start MODULE dcerpc_drsuapi
 [MODULE::dcerpc_drsuapi]
 INIT_FUNCTION = dcerpc_server_drsuapi_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/drsuapi/dcesrv_drsuapi.o
-ADD_OBJ_FILES = \
-               rpc_server/drsuapi/drsuapi_cracknames.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               drsuapi/dcesrv_drsuapi.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
                DCERPC_COMMON \
@@ -178,9 +190,9 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_dssetup
 [MODULE::dcerpc_dssetup]
 INIT_FUNCTION = dcerpc_server_dssetup_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/dssetup/dcesrv_dssetup.o
+SUBSYSTEM = DCERPC_SERVER
+OBJ_FILES = \
+               dssetup/dcesrv_dssetup.o
 REQUIRED_SUBSYSTEMS = \
                SAMDB \
                DCERPC_COMMON \
@@ -189,17 +201,18 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 
 ################################################
-# Start SUBSYSTEM DCERPC
-[SUBSYSTEM::DCERPC]
-INIT_OBJ_FILES = \
-               rpc_server/dcerpc_server.o
-ADD_OBJ_FILES = \
-               rpc_server/dcerpc_sock.o \
-               rpc_server/dcesrv_auth.o \
-               rpc_server/handles.o
+# 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
 ################################################