Fix two remaining missing symbols in smbtorture4.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 22:00:10 +0000 (23:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 22 Dec 2008 22:00:10 +0000 (23:00 +0100)
source4/param/config.mk
source4/smb_server/config.mk

index 1341a92bbdc4251edcd4943684c3550499052253..b60d39299c112462fadb5404ca07f4010b19e3e4 100644 (file)
@@ -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
index 8031c4eb1f12832e7d6ad58a670d7fbc6cc2a4a2..a9d3decf49000f68984e0ae6e68bb0dfe65c4599 100644 (file)
@@ -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