r15387: Fix installation of dcerpc headers, remove more instances of uint_t

[jelmer/samba4-debian.git] / source / rpc_server / config.mk

diff --git a/source/rpc_server/config.mk b/source/rpc_server/config.mk
index af3c61cb2e7bb1258b2d5e6ef8f1f4e41ecefd3c..17e5ca8d81d7e17e3ad748db645440a301afd804 100644 (file)
--- a/source/rpc_server/config.mk
+++ b/source/rpc_server/config.mk
@@ -3,9 +3,11 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
-ADD_OBJ_FILES = \
-               rpc_server/common/server_info.o \
-               rpc_server/common/share_info.o
+PUBLIC_PROTO_HEADER = common/proto.h
+PUBLIC_HEADERS = common/common.h
+OBJ_FILES = \
+               common/server_info.o \
+               common/share_info.o
 #
 # End SUBSYSTEM DCERPC_COMMON
 ################################################
@@ -15,16 +17,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 = \
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
-               DCOM \
+               dcom
 # End MODULE dcerpc_dcom
 ################################################
 
@@ -32,10 +34,10 @@ 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
-REQUIRED_SUBSYSTEMS = NDR_ECHO
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               echo/rpc_echo.o
+PUBLIC_DEPENDENCIES = NDR_ECHO 
 # End MODULE dcerpc_rpcecho
 ################################################
 
@@ -43,10 +45,10 @@ 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
-REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               epmapper/rpc_epmapper.o
+PUBLIC_DEPENDENCIES = NDR_EPMAPPER
 # End MODULE dcerpc_epmapper
 ################################################
 
@@ -54,11 +56,11 @@ 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
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB NDR_ALL
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               remote/dcesrv_remote.o
+PUBLIC_DEPENDENCIES = \
+               LIBCLI_SMB NDR_TABLE
 # End MODULE dcerpc_remote
 ################################################
 
@@ -66,10 +68,10 @@ 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
-REQUIRED_SUBSYSTEMS = \
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               srvsvc/dcesrv_srvsvc.o
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON NDR_SRVSVC
 # End MODULE dcerpc_srvsvc
 ################################################
@@ -78,10 +80,10 @@ 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
-REQUIRED_SUBSYSTEMS = \
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               wkssvc/dcesrv_wkssvc.o
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON NDR_WKSSVC
 # End MODULE dcerpc_wkssvc
 ################################################
@@ -90,11 +92,12 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_unixinfo
 [MODULE::dcerpc_unixinfo]
 INIT_FUNCTION = dcerpc_server_unixinfo_init
-SUBSYSTEM = DCERPC
-INIT_OBJ_FILES = \
-               rpc_server/unixinfo/dcesrv_unixinfo.o
-REQUIRED_SUBSYSTEMS = \
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               unixinfo/dcesrv_unixinfo.o
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
+               SAMDB \
                NDR_UNIXINFO
 # End MODULE dcerpc_unixinfo
 ################################################
@@ -103,12 +106,12 @@ REQUIRED_SUBSYSTEMS = \
 # 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
-REQUIRED_SUBSYSTEMS = \
+PRIVATE_PROTO_HEADER = samr/proto.h
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               samr/dcesrv_samr.o \
+               samr/samr_password.o
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
                NDR_SAMR
@@ -119,11 +122,12 @@ 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
-REQUIRED_SUBSYSTEMS = \
-               REGISTRY NDR_WINREG
+SUBSYSTEM = dcerpc_server
+OUTPUT_TYPE = INTEGRATED
+OBJ_FILES = \
+               winreg/rpc_winreg.o
+PUBLIC_DEPENDENCIES = \
+               registry NDR_WINREG
 # End MODULE dcerpc_winreg
 ################################################
 
@@ -131,13 +135,14 @@ 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
-REQUIRED_SUBSYSTEMS = \
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               netlogon/dcerpc_netlogon.o
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
                SCHANNELDB \
-               NDR_NETLOGON
+               NDR_NETLOGON \
+               auth_sam
 # End MODULE dcerpc_netlogon
 ################################################
 
@@ -145,13 +150,14 @@ 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
-REQUIRED_SUBSYSTEMS = \
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               lsa/dcesrv_lsa.o
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
-               NDR_LSA
+               NDR_LSA \
+               LIBCLI_AUTH
 # End MODULE dcerpc_lsa
 ################################################
 
@@ -159,13 +165,14 @@ 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
-REQUIRED_SUBSYSTEMS = \
+SUBSYSTEM = dcerpc_server
+OUTPUT_TYPE = INTEGRATED
+OBJ_FILES = \
+               spoolss/dcesrv_spoolss.o
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
                NDR_SPOOLSS \
-               NTPTR
+               ntptr
 # End MODULE dcerpc_spoolss
 ################################################
 
@@ -173,12 +180,10 @@ REQUIRED_SUBSYSTEMS = \
 # 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
-REQUIRED_SUBSYSTEMS = \
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               drsuapi/dcesrv_drsuapi.o
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
                NDR_DRSUAPI
@@ -189,10 +194,10 @@ 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
-REQUIRED_SUBSYSTEMS = \
+SUBSYSTEM = dcerpc_server
+OBJ_FILES = \
+               dssetup/dcesrv_dssetup.o
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
                NDR_DSSETUP
@@ -200,17 +205,22 @@ 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
-REQUIRED_SUBSYSTEMS = \
+# Start SUBSYSTEM dcerpc_server
+[MODULE::dcerpc_server]
+INIT_FUNCTION = server_service_rpc_init
+SUBSYSTEM = service
+PUBLIC_HEADERS = dcerpc_server.h
+PUBLIC_PROTO_HEADER = dcerpc_server_proto.h
+OBJ_FILES = \
+               dcerpc_server.o \
+               dcerpc_sock.o \
+               dcesrv_auth.o \
+               handles.o
+PUBLIC_DEPENDENCIES = \
                LIBCLI_AUTH \
-               NDR_RAW
+               LIBNDR \
+               dcerpc
+               
 #
 # End SUBSYSTEM DCERPC
 ################################################