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 4aeb4f79c74c33d8f41f00fc5a0f71d21e22d459..d1c2bf8d922db861ef552be79cc149dd913372f5 100644 (file)
--- a/source/rpc_server/config.mk
+++ b/source/rpc_server/config.mk
@@ -3,6 +3,8 @@
 ################################################
 # Start SUBSYSTEM DCERPC_COMMON
 [SUBSYSTEM::DCERPC_COMMON]
+PUBLIC_PROTO_HEADER = common/proto.h
+PUBLIC_HEADERS = common/common.h
 OBJ_FILES = \
                common/server_info.o \
                common/share_info.o
@@ -10,32 +12,14 @@ 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]
 INIT_FUNCTION = dcerpc_server_rpcecho_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                echo/rpc_echo.o
-REQUIRED_SUBSYSTEMS = NDR_ECHO
+PUBLIC_DEPENDENCIES = NDR_ECHO 
 # End MODULE dcerpc_rpcecho
 ################################################
 
@@ -43,10 +27,10 @@ REQUIRED_SUBSYSTEMS = NDR_ECHO
 # Start MODULE dcerpc_epmapper
 [MODULE::dcerpc_epmapper]
 INIT_FUNCTION = dcerpc_server_epmapper_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                epmapper/rpc_epmapper.o
-REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
+PUBLIC_DEPENDENCIES = NDR_EPMAPPER
 # End MODULE dcerpc_epmapper
 ################################################
 
@@ -54,11 +38,11 @@ REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 # Start MODULE dcerpc_remote
 [MODULE::dcerpc_remote]
 INIT_FUNCTION = dcerpc_server_remote_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                remote/dcesrv_remote.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSMB NDR_ALL
+PUBLIC_DEPENDENCIES = \
+               LIBCLI_SMB NDR_TABLE
 # End MODULE dcerpc_remote
 ################################################
 
@@ -66,11 +50,13 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_srvsvc
 [MODULE::dcerpc_srvsvc]
 INIT_FUNCTION = dcerpc_server_srvsvc_init
-SUBSYSTEM = DCERPC_SERVER
+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
 ################################################
 
@@ -78,10 +64,10 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_wkssvc
 [MODULE::dcerpc_wkssvc]
 INIT_FUNCTION = dcerpc_server_wkssvc_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                wkssvc/dcesrv_wkssvc.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON NDR_WKSSVC
 # End MODULE dcerpc_wkssvc
 ################################################
@@ -90,11 +76,12 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_unixinfo
 [MODULE::dcerpc_unixinfo]
 INIT_FUNCTION = dcerpc_server_unixinfo_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                unixinfo/dcesrv_unixinfo.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
+               SAMDB \
                NDR_UNIXINFO
 # End MODULE dcerpc_unixinfo
 ################################################
@@ -103,11 +90,12 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_samr
 [MODULE::dcerpc_samr]
 INIT_FUNCTION = dcerpc_server_samr_init
-SUBSYSTEM = DCERPC_SERVER
+PRIVATE_PROTO_HEADER = samr/proto.h
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                samr/dcesrv_samr.o \
                samr/samr_password.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
                NDR_SAMR
@@ -118,12 +106,12 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_winreg
 [MODULE::dcerpc_winreg]
 INIT_FUNCTION = dcerpc_server_winreg_init
-SUBSYSTEM = DCERPC_SERVER
-OUTPUT_TYPE = MERGEDOBJ
+SUBSYSTEM = dcerpc_server
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                winreg/rpc_winreg.o
-REQUIRED_SUBSYSTEMS = \
-               REGISTRY NDR_WINREG
+PUBLIC_DEPENDENCIES = \
+               registry NDR_WINREG
 # End MODULE dcerpc_winreg
 ################################################
 
@@ -131,27 +119,30 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_netlogon
 [MODULE::dcerpc_netlogon]
 INIT_FUNCTION = dcerpc_server_netlogon_init
-SUBSYSTEM = DCERPC_SERVER
+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
-SUBSYSTEM = DCERPC_SERVER
+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
 ################################################
 
@@ -159,14 +150,14 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_spoolss
 [MODULE::dcerpc_spoolss]
 INIT_FUNCTION = dcerpc_server_spoolss_init
-SUBSYSTEM = DCERPC_SERVER
-OUTPUT_TYPE = MERGEDOBJ
+SUBSYSTEM = dcerpc_server
+OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
                spoolss/dcesrv_spoolss.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                DCERPC_COMMON \
                NDR_SPOOLSS \
-               NTPTR
+               ntptr
 # End MODULE dcerpc_spoolss
 ################################################
 
@@ -174,10 +165,10 @@ REQUIRED_SUBSYSTEMS = \
 # Start MODULE dcerpc_drsuapi
 [MODULE::dcerpc_drsuapi]
 INIT_FUNCTION = dcerpc_server_drsuapi_init
-SUBSYSTEM = DCERPC_SERVER
+SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
                drsuapi/dcesrv_drsuapi.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                SAMDB \
                DCERPC_COMMON \
                NDR_DRSUAPI
@@ -185,33 +176,21 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 
 ################################################
-# 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]
-PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
+# 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_np.o \
                dcerpc_sock.o \
                dcesrv_auth.o \
                handles.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                LIBCLI_AUTH \
                LIBNDR \
-               LIBDCERPC
+               dcerpc
 #
 # End SUBSYSTEM DCERPC
 ################################################