in ctdb_getrecmaster_recv return 0 (success) when the fucntion completed correctly...

[sahlberg/ctdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index eeef41d4abbed4bf161b3b7d936ea8fd720cdadb..72c359bf3e6c39f575e73f042e4451edd5c98c6f 100755 (executable)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,6 +2,9 @@
 
 
 CC = @CC@
+AR = ar
+ARFLAGS = cru
+RANLIB = ranlib
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
@@ -38,16 +41,22 @@ UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util
        lib/util/util_time.o lib/util/util_file.o lib/util/fault.o lib/util/substitute.o \
        lib/util/signal.o
 
-CTDB_COMMON_OBJ =  common/ctdb_io.o common/ctdb_util.o \
-       common/ctdb_ltdb.o common/ctdb_message.o common/cmdline.o  \
-       lib/util/debug.o common/rb_tree.o @CTDB_SYSTEM_OBJ@ common/system_common.o \
-       common/ctdb_logging.c
+CTDB_LIB_OBJ = libctdb/libctdb.o libctdb/ctdb_io.o \
+       libctdb/ctdb_client.o libctdb/ctdb_message.o \
+       libctdb/ctdb_ltdb.o \
+       libctdb/ctdb_util.o lib/util/debug.o \
+       @EVENTS_OBJ@ @TDB_OBJ@ $(UTIL_OBJ) \
+       @LIBREPLACEOBJ@ 
+
+CTDB_COMMON_OBJ = common/cmdline.o common/rb_tree.o @CTDB_SYSTEM_OBJ@ \
+       common/system_common.o common/ctdb_logging.c \
+       @TALLOC_OBJ@ libctdb/libctdb.a 
 
 CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
 
 CTDB_CLIENT_OBJ = client/ctdb_client.o \
-       $(CTDB_COMMON_OBJ) $(POPT_OBJ) $(UTIL_OBJ) @TALLOC_OBJ@ @TDB_OBJ@ \
-       @LIBREPLACEOBJ@ $(EXTRA_OBJ) @EVENTS_OBJ@ 
+       $(CTDB_COMMON_OBJ) $(POPT_OBJ) \
+       $(EXTRA_OBJ)
 
 CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \
        server/ctdb_recoverd.o server/ctdb_recover.o server/ctdb_freeze.o \
@@ -102,6 +111,12 @@ bin/ctdbd: $(CTDB_SERVER_OBJ)
        @echo Linking $@
        @$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
 
+libctdb/libctdb.a: $(CTDB_LIB_OBJ)
+       @echo Linking $@
+       -rm -f libctdb.a
+       @$(AR) $(ARFLAGS) libctdb/libctdb.a $(CTDB_LIB_OBJ)
+       @$(RANLIB) libctdb/libctdb.a
+
 bin/scsi_io: $(CTDB_CLIENT_OBJ) utils/scsi_io/scsi_io.o 
        @echo Linking $@
        @$(CC) $(CFLAGS) -o $@ utils/scsi_io/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
@@ -184,7 +199,7 @@ doc: doc/ctdb.1 doc/ctdb.1.html \
        doc/onnode.1 doc/onnode.1.html
 
 clean:
-       rm -f *.o */*.o */*/*.o */*~
+       rm -f *.o */*.o */*.a */*/*.o */*~
        rm -f utils/smnotify/gen_xdr.c
        rm -f $(BINS) $(SBINS) $(TEST_BINS)
 
@@ -208,6 +223,7 @@ install: all
        ${INSTALLCMD} -m 755 bin/smnotify $(DESTDIR)$(bindir)
        $(INSTALLCMD) -m 755 bin/ping_pong $(DESTDIR)$(bindir)
        ${INSTALLCMD} -m 644 include/ctdb.h $(DESTDIR)$(includedir)
+       ${INSTALLCMD} -m 644 include/ctdb_protocol.h $(DESTDIR)$(includedir)
        ${INSTALLCMD} -m 644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
        ${INSTALLCMD} -m 644 config/functions $(DESTDIR)$(etcdir)/ctdb
        ${INSTALLCMD} -m 755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
@@ -219,6 +235,7 @@ install: all
        ${INSTALLCMD} -m 755 config/events.d/10.interface $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/11.natgw $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/11.routing $(DESTDIR)$(etcdir)/ctdb/events.d
+       ${INSTALLCMD} -m 755 config/events.d/13.per_ip_routing $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 644 config/events.d/20.multipathd $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 644 config/events.d/31.clamd $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/40.vsftpd $(DESTDIR)$(etcdir)/ctdb/events.d
@@ -226,6 +243,7 @@ install: all
        ${INSTALLCMD} -m 755 config/events.d/50.samba $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/60.nfs $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/61.nfstickle $(DESTDIR)$(etcdir)/ctdb/events.d
+       ${INSTALLCMD} -m 755 config/events.d/62.cnfs $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/70.iscsi $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/91.lvs $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 tools/ctdb_diagnostics $(DESTDIR)$(bindir)
@@ -235,6 +253,7 @@ install: all
        if [ -f doc/ctdbd.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd.1 $(DESTDIR)$(mandir)/man1; fi
        if [ -f doc/onnode.1 ];then ${INSTALLCMD} -m 644 doc/onnode.1 $(DESTDIR)$(mandir)/man1; fi
        if [ ! -f $(DESTDIR)$(etcdir)/ctdb/notify.sh ];then ${INSTALLCMD} -m 755 config/notify.sh $(DESTDIR)$(etcdir)/ctdb; fi
+       if [ ! -f $(DESTDIR)$(etcdir)/ctdb/ctdb-crash-cleanup.sh ];then ${INSTALLCMD} -m 755 config/ctdb-crash-cleanup.sh $(DESTDIR)$(etcdir)/ctdb; fi
 
 test: all
        tests/run_tests.sh