[SCM] Samba Shared Repository - branch master updated - c2872a6ba5a7012028f1b9167c61d5907b8f7d3d

[Jelmer Vernooij]

The branch, master has been updated
       via  c2872a6ba5a7012028f1b9167c61d5907b8f7d3d (commit)
       via  b86b2ce662e4d0a29467e4029c640b6c9e7a06f0 (commit)
      from  4b2bdfec785bc6bebc370320c9aee9128510ba92 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c2872a6ba5a7012028f1b9167c61d5907b8f7d3d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Dec 22 23:36:48 2008 +0100

    Force symbolic links for shared library sonames to be created,
    as they are required at run-time.

commit b86b2ce662e4d0a29467e4029c640b6c9e7a06f0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Dec 22 23:00:10 2008 +0100

    Fix two remaining missing symbols in smbtorture4.

-----------------------------------------------------------------------

Summary of changes:
 source3/samba4-templates.mk     |    2 +-
 source4/build/make/templates.mk |    2 +-
 source4/param/config.mk         |    4 ++--
 source4/smb_server/config.mk    |    1 +
 4 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4-templates.mk b/source3/samba4-templates.mk
index e691af5..ecebce6 100644
--- a/source3/samba4-templates.mk
+++ b/source3/samba4-templates.mk
@@ -90,7 +90,7 @@ $(4): $(1)
 endif
 
 ifneq ($(notdir $(1)),$(notdir $(5)))
-$(5): $(1)
+$(5): $(1) $(4)
 	@echo "Creating symbolic link for $$@"
 	@ln -fs $$(<F) $$@
 endif
diff --git a/source4/build/make/templates.mk b/source4/build/make/templates.mk
index f7eab6c..dbfc738 100644
--- a/source4/build/make/templates.mk
+++ b/source4/build/make/templates.mk
@@ -87,7 +87,7 @@ $(4): $(1)
 endif
 
 ifneq ($(notdir $(1)),$(notdir $(5)))
-$(5): $(1)
+$(5): $(1) $(4)
 	@echo "Creating symbolic link for $$@"
 	@ln -fs $$(<F) $$@
 endif
diff --git a/source4/param/config.mk b/source4/param/config.mk
index 1341a92..b60d392 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 8031c4e..a9d3dec 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


-- 
Samba Shared Repository