From 8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 14 Nov 2004 16:22:01 +0000
Subject: r3733: More build system fixes/features:  - Use .mk files directly
 (no need for a SMB_*_MK() macro when adding a new SUBSYSTEM, MODULE or
 BINARY). This allows addition of new modules and subsystems without running
 configure  - Add support for generating .dot files with the Samba4 dependency
 tree (as used by the graphviz and springgraph utilities) (This used to be
 commit 64826da834e26ee0488674e27a0eae36491ee179)

---
 source4/rpc_server/config.m4 | 21 ---------------------
 source4/rpc_server/config.mk | 12 ++++++++++++
 2 files changed, 12 insertions(+), 21 deletions(-)
 delete mode 100644 source4/rpc_server/config.m4

(limited to 'source4/rpc_server')

diff --git a/source4/rpc_server/config.m4 b/source4/rpc_server/config.m4
deleted file mode 100644
index 7fb8b555c2..0000000000
--- a/source4/rpc_server/config.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl # DCERPC Server subsystem
-
-SMB_SUBSYSTEM_MK(DCERPC_COMMON,rpc_server/config.mk)
-
-SMB_SUBSYSTEM_MK(SAMDB,rpc_server/config.mk)
-SMB_SUBSYSTEM_MK(SCHANNELDB,rpc_server/config.mk)
-
-SMB_MODULE_MK(dcerpc_rpcecho,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_epmapper,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_remote,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_srvsvc,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_wkssvc,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_samr,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_winreg,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_netlogon,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_lsarpc,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_spoolss,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_dcom,DCERPC,STATIC,rpc_server/config.mk)
-SMB_MODULE_MK(dcerpc_drsuapi,DCERPC,STATIC,rpc_server/config.mk)
-
-SMB_SUBSYSTEM_MK(DCERPC,rpc_server/config.mk)
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 4b89e875cf..4326120e57 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -15,6 +15,7 @@ ADD_OBJ_FILES = \
 # Start MODULE dcerpc_DCOM
 [MODULE::dcerpc_dcom]
 INIT_FUNCTION = dcerpc_server_dcom_init
+SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
 		rpc_server/dcom/oxidresolver.o \
 		rpc_server/dcom/rot.o \
@@ -53,6 +54,7 @@ INIT_OBJ_FILES = \
 # Start MODULE dcerpc_rpcecho
 [MODULE::dcerpc_rpcecho]
 INIT_FUNCTION = dcerpc_server_rpcecho_init
+SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
 		rpc_server/echo/rpc_echo.o
 # End MODULE dcerpc_rpcecho
@@ -62,6 +64,7 @@ INIT_OBJ_FILES = \
 # Start MODULE dcerpc_epmapper
 [MODULE::dcerpc_epmapper]
 INIT_FUNCTION = dcerpc_server_epmapper_init
+SUBSYSTEM = DCERPC
 INIT_OBJ_FILES = \
 		rpc_server/epmapper/rpc_epmapper.o
 # End MODULE dcerpc_epmapper
@@ -71,6 +74,7 @@ INIT_OBJ_FILES = \
 # 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 = \
@@ -82,6 +86,7 @@ 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 = \
@@ -93,6 +98,7 @@ 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 = \
@@ -104,6 +110,7 @@ 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 = \
@@ -118,6 +125,7 @@ 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 = \
@@ -129,6 +137,7 @@ 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 = \
@@ -141,6 +150,7 @@ 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 = \
@@ -153,6 +163,7 @@ 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
@@ -165,6 +176,7 @@ 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 = \
-- 
cgit