diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-03-03 00:27:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:07 -0500 |
| commit | bedf53f9e0f7388c6ed8c1533eb89e55a88e65bd (patch) | |
| tree | e0497b69e3037ab20d949909965d876d72201359 | |
| parent | fcaeedeff3c7d65f65da19440eb7b1ac01481167 (diff) | |
| download | samba-bedf53f9e0f7388c6ed8c1533eb89e55a88e65bd.tar.gz samba-bedf53f9e0f7388c6ed8c1533eb89e55a88e65bd.tar.bz2 samba-bedf53f9e0f7388c6ed8c1533eb89e55a88e65bd.zip | |
r21669: Fix --enable-dso build
(This used to be commit 7cf9d07c88b0c81777bb9363d445ac657982a366)
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | source4/cluster/ctdb/config.mk | 11 | ||||
| -rw-r--r-- | source4/ntvfs/common/config.mk | 1 | ||||
| -rw-r--r-- | source4/smbd/config.mk | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/.bzrignore b/.bzrignore index 0bed6a8039..2df8f2d3b0 100644 --- 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 72d768659c..89ac7aa7f4 100644 --- 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 fd1b55a4f7..99a46323e2 100644 --- 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 5ae94c5e13..b242f91ea5 100644 --- 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 ################################# |