Rev 11640: Fix --enable-dso build in
file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Sat Mar 3 00:24:47 GMT 2007
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11640
revision-id: jelmer at samba.org-20070303002438-925hy1uxyetacn9s
parent: svn-v2:21668 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Sat 2007-03-03 01:24:38 +0100
message:
Fix --enable-dso build
modified:
.bzrignore svn-v2:17811 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-.bzrignore
source/cluster/ctdb/config.mk svn-v2:20889 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fcluster%2fctdb%2fconfig.mk
source/ntvfs/common/config.mk svn-v2:14835 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fntvfs%2fcommon%2fconfig.mk
source/smbd/config.mk svn-v2:864 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fsmbd%2fconfig.mk
=== modified file '.bzrignore'
--- a/.bzrignore 2007-02-21 11:45:40 +0000
+++ b/.bzrignore 2007-03-03 00:24:38 +0000
@@ -170,3 +170,4 @@
webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/locale/translation
webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/messages.pot
source/torture/ndr/proto.h
+source/bin/modules/*
=== modified file 'source/cluster/ctdb/config.mk'
--- a/source/cluster/ctdb/config.mk 2007-02-08 02:57:08 +0000
+++ b/source/cluster/ctdb/config.mk 2007-03-03 00:24:38 +0000
@@ -1,19 +1,16 @@
##################
-[MODULE::brlock_ctdb]
-SUBSYSTEM = ntvfs_common
+[SUBSYSTEM::brlock_ctdb]
OBJ_FILES = brlock_ctdb.o
##################
-[MODULE::ctdb_tcp]
-SUBSYSTEM = CLUSTER
+[SUBSYSTEM::ctdb_tcp]
OBJ_FILES = \
tcp/tcp_init.o \
tcp/tcp_io.o \
tcp/tcp_connect.o
##################
-[MODULE::ctdb]
-SUBSYSTEM = CLUSTER
+[SUBSYSTEM::ctdb]
OBJ_FILES = \
ctdb_cluster.o \
common/ctdb.o \
@@ -21,5 +18,5 @@
common/ctdb_message.o \
common/ctdb_ltdb.o \
common/ctdb_util.o
+PUBLIC_DEPENDENCIES = LIBTDB LIBTALLOC
PRIVATE_DEPENDENCIES = ctdb_tcp
-PUBLIC_DEPENDENCIES = LIBTDB LIBTALLOC
=== modified file 'source/ntvfs/common/config.mk'
--- a/source/ntvfs/common/config.mk 2007-01-19 03:58:16 +0000
+++ b/source/ntvfs/common/config.mk 2007-03-03 00:24:38 +0000
@@ -9,5 +9,6 @@
opendb.o \
notify.o
PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify share
+PRIVATE_DEPENDENCIES = brlock_ctdb
# End LIBRARY ntvfs_common
################################################
=== modified file 'source/smbd/config.mk'
--- a/source/smbd/config.mk 2006-11-06 12:05:09 +0000
+++ b/source/smbd/config.mk 2007-03-03 00:24:38 +0000
@@ -46,6 +46,7 @@
registry \
ntptr \
ntvfs \
- share
+ share \
+ CLUSTER
# End BINARY smbd
#################################
More information about the samba-cvs
mailing list