diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-06-10 17:02:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:14 -0500 |
| commit | de565785f5e1f097bd75f57331425c4185185f80 (patch) | |
| tree | af24bb44388f9ffa2077435cc3fea134557c186b /source3/Makefile.in | |
| parent | b05c7b97830f6029c264fc44831c2f5eae4f0c83 (diff) | |
| download | samba-de565785f5e1f097bd75f57331425c4185185f80.tar.gz samba-de565785f5e1f097bd75f57331425c4185185f80.tar.bz2 samba-de565785f5e1f097bd75f57331425c4185185f80.zip | |
r23410: Merge the core of the cluster code.
I'm 100% certain I've forgotten to merge something, but the main code
should be in. It's mainly in dbwrap_ctdb.c, ctdbd_conn.c and
messages_ctdbd.c.
There should be no changes to the non-cluster case, it does survive make
test on my laptop.
It survives some very basic tests with ctdbd enables, I did not do the
full test suite for clusters yet.
Phew...
Volker
(This used to be commit 15553d6327a3aecdd2b0b94a3656d04bf4106323)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index f39c568e65..d427ed0945 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -101,6 +101,7 @@ INSTALLPERMS_DATA = 0644 LOGFILEBASE = @logfilebase@ CONFIGFILE = $(CONFIGDIR)/smb.conf LMHOSTSFILE = $(CONFIGDIR)/lmhosts +CTDBDIR = @ctdbdir@ # This is where smbpasswd et al go PRIVATEDIR = @privatedir@ @@ -136,7 +137,7 @@ LIBADDNS_MINOR=1 FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) FLAGS2 = FLAGS3 = -FLAGS4 = +FLAGS4 = -I$(CTDBDIR)/include FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) FLAGS = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3 @@ -152,6 +153,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \ -DLIBDIR=\"$(LIBDIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" \ -DSHLIBEXT=\"@SHLIBEXT@\" \ + -DCTDBDIR=\"$(CTDBDIR)\" \ -DCONFIGDIR=\"$(CONFIGDIR)\" # Note that all executable programs now provide for an optional executable suffix. @@ -213,7 +215,7 @@ TDBBASE_OBJ = lib/tdb/common/tdb.o lib/tdb/common/dump.o lib/tdb/common/error.o lib/tdb/common/traverse.o TDB_OBJ = $(TDBBASE_OBJ) lib/util_tdb.o\ - lib/dbwrap.o lib/dbwrap_tdb.o + lib/dbwrap.o lib/dbwrap_tdb.o lib/dbwrap_ctdb.o SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@ @@ -263,7 +265,8 @@ TALLOC_OBJ = lib/talloc/talloc.o LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(TALLOC_OBJ) \ - lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o + lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \ + lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o LIB_WITH_PROTO_OBJ = $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \ lib/interface.o lib/md4.o \ |