s4:samldb LDB module - make the "userAccountControl" and "groupType" modify handlers...

[kai/samba-autobuild/.git] / source4 / smb_server / config.mk

diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index 4f0fbeb85c8bc747d31d10d4f6ecd5011890f3be..a9d3decf49000f68984e0ae6e68bb0dfe65c4599 100644 (file)
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -2,12 +2,21 @@
 #
 [MODULE::SERVICE_SMB]
 INIT_FUNCTION = server_service_smb_init
-SUBSYSTEM = smbd
+SUBSYSTEM = service
+OUTPUT_TYPE = MERGED_OBJ
 PRIVATE_DEPENDENCIES = SMB_SERVER
 
 SERVICE_SMB_OBJ_FILES = $(smb_serversrcdir)/smb_server.o
 
-$(call proto_header_template,$(smb_serversrcdir)/service_smb_proto.h,$(SERVICE_SMB_OBJ_FILES:.o=.c))
+$(eval $(call proto_header_template,$(smb_serversrcdir)/service_smb_proto.h,$(SERVICE_SMB_OBJ_FILES:.o=.c)))
+
+# samba3 SMB server subsystem
+#
+[MODULE::SERVICE_SAMBA3_SMB]
+INIT_FUNCTION = server_service_samba3_smb_init
+SUBSYSTEM = service
+
+SERVICE_SAMBA3_SMB_OBJ_FILES = $(smb_serversrcdir)/smb_samba3.o
 
 #######################
 # Start SUBSYSTEM SMB
@@ -27,7 +36,7 @@ SMB_SERVER_OBJ_FILES = $(addprefix $(smb_serversrcdir)/, \
                blob.o \
                management.o)
 
-$(call proto_header_template,$(smb_serversrcdir)/smb_server_proto.h,$(SMB_SERVER_OBJ_FILES:.o=.c))
+$(eval $(call proto_header_template,$(smb_serversrcdir)/smb_server_proto.h,$(SMB_SERVER_OBJ_FILES:.o=.c)))
 
 mkinclude smb/config.mk
 mkinclude smb2/config.mk