summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-05-24 23:57:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:13 -0500
commit9425495e30825079acfe9584642ec12fd084347f (patch)
treea33afb95797fa2a2793702b6e6c5fd2bffe5b081
parenta96ccb70224b20379c401052023d6e8eecd15357 (diff)
downloadsamba-9425495e30825079acfe9584642ec12fd084347f.tar.gz
samba-9425495e30825079acfe9584642ec12fd084347f.tar.xz
samba-9425495e30825079acfe9584642ec12fd084347f.zip
r864: convert the smbd/* code to a config.mk file
and add server_auth, server_smb, server_rpc as server modules metze (This used to be commit ecdeedb2ac81a3c816f7d72b6f39f16dd6e6267f)
-rw-r--r--source4/configure.in9
-rw-r--r--source4/smbd/config.m49
-rw-r--r--source4/smbd/config.mk51
3 files changed, 61 insertions, 8 deletions
diff --git a/source4/configure.in b/source4/configure.in
index 15019b8e006..32b600dc3bc 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -237,14 +237,7 @@ SMB_EXT_LIB(ALLLIBS,
[${ALLLIBS_CPPFLAGS}],
[${ALLLIBS_LDFLAGS}])
-SMB_BINARY(smbd, [ALL], [SBIN],
- [smbd/server.o
- smbd/process.o
- lib/server_mutex.o
- smbd/build_options.o
- smbd/rewrite.o],
- [],
- [PROCESS_MODEL SMB AUTH NTVFS DCERPC LIBBASIC CONFIG LIBCMDLINE LIBSMB REGISTRY])
+SMB_INCLUDE_M4(smbd/config.m4)
SMB_BINARY(smbclient, [ALL], [BIN],
[client/client.o
diff --git a/source4/smbd/config.m4 b/source4/smbd/config.m4
new file mode 100644
index 00000000000..0f2f65a14e7
--- /dev/null
+++ b/source4/smbd/config.m4
@@ -0,0 +1,9 @@
+dnl # SMB server subsystem
+
+SMB_MODULE_MK(server_smb,SERVER,STATIC,smbd/config.mk)
+SMB_MODULE_MK(server_rpc,SERVER,STATIC,smbd/config.mk)
+SMB_MODULE_MK(server_auth,SERVER,STATIC,smbd/config.mk)
+
+SMB_SUBSYSTEM_MK(SERVER,smbd/config.mk)
+
+SMB_BINARY_MK(smbd, smbd/config.mk)
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
new file mode 100644
index 00000000000..1711a86a97e
--- /dev/null
+++ b/source4/smbd/config.mk
@@ -0,0 +1,51 @@
+# server subsystem
+
+################################################
+# Start MODULE server_auth
+[MODULE::server_auth]
+REQUIRED_SUBSYSTEMS = \
+ AUTH
+# End MODULE server_auth
+################################################
+
+################################################
+# Start MODULE server_smb
+[MODULE::server_smb]
+REQUIRED_SUBSYSTEMS = \
+ SMB
+# End MODULE server_smb
+################################################
+
+################################################
+# Start MODULE server_rpc
+[MODULE::server_rpc]
+REQUIRED_SUBSYSTEMS = \
+ DCERPC
+# End MODULE server_rpc
+################################################
+
+#######################
+# Start SUBSYSTEM SERVER
+[SUBSYSTEM::SERVER]
+INIT_OBJ_FILES = \
+ smbd/server.o
+ADD_OBJ_FILES = \
+ smbd/process.o \
+ lib/server_mutex.o \
+ smbd/build_options.o \
+ smbd/rewrite.o
+REQUIRED_SUBSYSTEMS = \
+ PROCESS_MODEL
+# End SUBSYSTEM SERVER
+#######################
+
+#################################
+# Start BINARY smbd
+[BINARY::smbd]
+REQUIRED_SUBSYSTEMS = \
+ SERVER \
+ CONFIG \
+ LIBCMDLINE \
+ LIBBASIC
+# End BINARY smbd
+#################################