r19507: Merge my DSO fixes branch. Building Samba's libraries as shared libraries

[kai/samba.git] / source / rpc_server / config.mk

diff --git a/source/rpc_server/config.mk b/source/rpc_server/config.mk
index 7ded61909553ada5741603e3924478509bd0ae4c..d1c2bf8d922db861ef552be79cc149dd913372f5 100644 (file)
--- a/source/rpc_server/config.mk
+++ b/source/rpc_server/config.mk
@@ -3,7 +3,8 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
-PRIVATE_PROTO_HEADER = common/proto.h
+PUBLIC_PROTO_HEADER = common/proto.h
+PUBLIC_HEADERS = common/common.h
 OBJ_FILES = \
                common/server_info.o \
                common/share_info.o
@@ -11,24 +12,6 @@ OBJ_FILES = \
 # End SUBSYSTEM DCERPC_COMMON
 ################################################
 
-################################################
-# Start MODULE dcerpc_dcom
-[MODULE::dcerpc_dcom]
-ENABLE = NO
-INIT_FUNCTION = dcerpc_server_dcom_init
-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 \
-               dcom
-# End MODULE dcerpc_dcom
-################################################
-
 ################################################
 # Start MODULE dcerpc_rpcecho
 [MODULE::dcerpc_rpcecho]
@@ -36,7 +19,7 @@ INIT_FUNCTION = dcerpc_server_rpcecho_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                echo/rpc_echo.o
-REQUIRED_SUBSYSTEMS = NDR_ECHO
+PUBLIC_DEPENDENCIES = NDR_ECHO 
 # End MODULE dcerpc_rpcecho
 ################################################
 
@@ -47,7 +30,7 @@ INIT_FUNCTION = dcerpc_server_epmapper_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                epmapper/rpc_epmapper.o
-REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
+PUBLIC_DEPENDENCIES = NDR_EPMAPPER
 # End MODULE dcerpc_epmapper
 ################################################
 
@@ -58,8 +41,8 @@ INIT_FUNCTION = dcerpc_server_remote_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                remote/dcesrv_remote.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB NDR_TABLE
+PUBLIC_DEPENDENCIES = \
+               LIBCLI_SMB NDR_TABLE
 # End MODULE dcerpc_remote
 ################################################
 
@@ -67,11 +50,13 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_srvsvc
 [MODULE::dcerpc_srvsvc]
 INIT_FUNCTION = dcerpc_server_srvsvc_init
+PRIVATE_PROTO_HEADER = srvsvc/proto.h
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
-               srvsvc/dcesrv_srvsvc.o
-REQUIRED_SUBSYSTEMS = \
-               DCERPC_COMMON NDR_SRVSVC
+               srvsvc/dcesrv_srvsvc.o \
+               srvsvc/srvsvc_ntvfs.o
+PUBLIC_DEPENDENCIES = \
+               DCERPC_COMMON NDR_SRVSVC share
 # End MODULE dcerpc_srvsvc
 ################################################
 
@@ -82,7 +67,7 @@ INIT_FUNCTION = dcerpc_server_wkssvc_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                wkssvc/dcesrv_wkssvc.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON NDR_WKSSVC
 # End MODULE dcerpc_wkssvc
 ################################################
@@ -94,8 +79,9 @@ INIT_FUNCTION = dcerpc_server_unixinfo_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                unixinfo/dcesrv_unixinfo.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
+               SAMDB \
                NDR_UNIXINFO
 # End MODULE dcerpc_unixinfo
 ################################################
@@ -109,7 +95,7 @@ SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                samr/dcesrv_samr.o \
                samr/samr_password.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
                NDR_SAMR
@@ -121,10 +107,10 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_winreg]
 INIT_FUNCTION = dcerpc_server_winreg_init
 SUBSYSTEM = dcerpc_server
-OUTPUT_TYPE = MERGEDOBJ
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                winreg/rpc_winreg.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                registry NDR_WINREG
 # End MODULE dcerpc_winreg
 ################################################
@@ -136,24 +122,27 @@ INIT_FUNCTION = dcerpc_server_netlogon_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                netlogon/dcerpc_netlogon.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
                SCHANNELDB \
-               NDR_NETLOGON
+               NDR_NETLOGON \
+               auth_sam
 # End MODULE dcerpc_netlogon
 ################################################
 
 ################################################
 # Start MODULE dcerpc_lsa
 [MODULE::dcerpc_lsarpc]
-INIT_FUNCTION = dcerpc_server_lsarpc_init
+INIT_FUNCTION = dcerpc_server_lsa_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                lsa/dcesrv_lsa.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
-               NDR_LSA
+               NDR_LSA \
+               LIBCLI_AUTH \
+               NDR_DSSETUP
 # End MODULE dcerpc_lsa
 ################################################
 
@@ -162,10 +151,10 @@ REQUIRED_SUBSYSTEMS = \
 [MODULE::dcerpc_spoolss]
 INIT_FUNCTION = dcerpc_server_spoolss_init
 SUBSYSTEM = dcerpc_server
-OUTPUT_TYPE = MERGEDOBJ
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                spoolss/dcesrv_spoolss.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
                NDR_SPOOLSS \
                ntptr
@@ -179,30 +168,18 @@ INIT_FUNCTION = dcerpc_server_drsuapi_init
 SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                drsuapi/dcesrv_drsuapi.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
                NDR_DRSUAPI
 # End MODULE dcerpc_drsuapi
 ################################################
 
-################################################
-# Start MODULE dcerpc_dssetup
-[MODULE::dcerpc_dssetup]
-INIT_FUNCTION = dcerpc_server_dssetup_init
-SUBSYSTEM = dcerpc_server
-OBJ_FILES = \
-               dssetup/dcesrv_dssetup.o
-REQUIRED_SUBSYSTEMS = \
-               SAMDB \
-               DCERPC_COMMON \
-               NDR_DSSETUP
-# End MODULE dcerpc_dssetup
-################################################
-
 ################################################
 # Start SUBSYSTEM dcerpc_server
-[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 = \
@@ -210,7 +187,7 @@ OBJ_FILES = \
                dcerpc_sock.o \
                dcesrv_auth.o \
                handles.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                LIBCLI_AUTH \
                LIBNDR \
                dcerpc