summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/param/config.mk4
-rw-r--r--source4/smb_server/config.mk1
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/param/config.mk b/source4/param/config.mk
index 1341a92bbd..b60d39299c 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -13,9 +13,9 @@ PUBLIC_HEADERS += param/param.h
PC_FILES += $(paramsrcdir)/samba-hostconfig.pc
[SUBSYSTEM::PROVISION]
-PRIVATE_DEPENDENCIES = LIBPYTHON swig_ldb param
+PRIVATE_DEPENDENCIES = LIBPYTHON swig_ldb
-PROVISION_OBJ_FILES = $(paramsrcdir)/provision.o
+PROVISION_OBJ_FILES = $(paramsrcdir)/provision.o $(param_OBJ_FILES)
#################################
# Start SUBSYSTEM share
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index 8031c4eb1f..a9d3decf49 100644
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -3,6 +3,7 @@
[MODULE::SERVICE_SMB]
INIT_FUNCTION = server_service_smb_init
SUBSYSTEM = service
+OUTPUT_TYPE = MERGED_OBJ
PRIVATE_DEPENDENCIES = SMB_SERVER
SERVICE_SMB_OBJ_FILES = $(smb_serversrcdir)/smb_server.o