r21669: Fix --enable-dso build

(This used to be commit 7cf9d07c88b0c81777bb9363d445ac657982a366)

diff --git a/.bzrignore b/.bzrignore
index 0bed6a8039f8ebe77efa9481a9b7c4ee816574aa..2df8f2d3b05875f09e1f8349b7d1cf940d23d00c 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -170,3 +170,4 @@ webapps/swat/source/class/swat/translation
 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/*

diff --git a/source4/cluster/ctdb/config.mk b/source4/cluster/ctdb/config.mk
index 72d768659cebbd16de1ba547a08b217102086444..89ac7aa7f49c6983f42f79e68ed500fb9297255b 100644 (file)
--- a/source4/cluster/ctdb/config.mk
+++ b/source4/cluster/ctdb/config.mk
@@ -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 @@ OBJ_FILES = \
                common/ctdb_message.o \
                common/ctdb_ltdb.o \
                common/ctdb_util.o
-PRIVATE_DEPENDENCIES = ctdb_tcp
 PUBLIC_DEPENDENCIES = LIBTDB LIBTALLOC
+PRIVATE_DEPENDENCIES = ctdb_tcp

diff --git a/source4/ntvfs/common/config.mk b/source4/ntvfs/common/config.mk
index fd1b55a4f7aff2ca10361306d82561d34e733420..99a46323e2ea274dd395a75c3ab2efd91d835952 100644 (file)
--- a/source4/ntvfs/common/config.mk
+++ b/source4/ntvfs/common/config.mk
@@ -9,5 +9,6 @@ OBJ_FILES = \
                opendb.o \
                notify.o
 PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify share
+PRIVATE_DEPENDENCIES = brlock_ctdb
 # End LIBRARY ntvfs_common
 ################################################

diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 5ae94c5e13a97d0d5b468f1aa39caac1896729a3..b242f91ea5455c5c6d79d88daa6df9a41f22ffd4 100644 (file)
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -46,6 +46,7 @@ PRIVATE_DEPENDENCIES = \
                registry \
                ntptr \
                ntvfs \
-               share
+               share \
+               CLUSTER
 # End BINARY smbd
 #################################