print the db name qwhen a chainunlock fails too

[rusty/ctdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 36dffe09c13675b4d99ec93afa5f9666081ca322..d2e0dea921549934d4b1867eb413dcfb9d0665e7 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@
@@ -43,6 +46,10 @@ CTDB_COMMON_OBJ =  common/ctdb_io.o common/ctdb_util.o \
        lib/util/debug.o common/rb_tree.o @CTDB_SYSTEM_OBJ@ common/system_common.o \
        common/ctdb_logging.c
 
+CTDB_LIB_OBJ = libctdb/ctdb.o libctdb/io_elem.o libctdb/local_tdb.o \
+       libctdb/messages.o libctdb/sync.o libctdb/control.o \
+       libctdb/logging.o
+
 CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
 
 CTDB_CLIENT_OBJ = client/ctdb_client.o \
@@ -72,7 +79,7 @@ DIRS = lib bin tests/bin
 
 .SUFFIXES: .c .o .h .1 .1.xml .1.html
 
-all: showflags dirs doc $(CTDB_SERVER_OBJ) $(CTDB_CLIENT_OBJ) $(BINS) $(SBINS) $(TEST_BINS)
+all: showflags dirs doc $(CTDB_SERVER_OBJ) $(CTDB_CLIENT_OBJ) $(CTDB_LIB_OBJ) $(BINS) $(SBINS) $(TEST_BINS)
 
 showflags:
        @echo 'ctdb will be compiled with flags:'
@@ -102,13 +109,19 @@ 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)
 
-bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o
+bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o libctdb/libctdb.a
        @echo Linking $@
-       @$(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+       @$(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) libctdb/libctdb.a
 
 bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
        @echo Linking $@
@@ -184,7 +197,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)
 
@@ -207,9 +220,12 @@ install: all
        ${INSTALLCMD} -m 755 bin/ctdbd $(DESTDIR)$(sbindir)
        ${INSTALLCMD} -m 755 bin/smnotify $(DESTDIR)$(bindir)
        $(INSTALLCMD) -m 755 bin/ping_pong $(DESTDIR)$(bindir)
+       $(INSTALLCMD) -m 755 libctdb/libctdb.a $(DESTDIR)$(libdir)
+       ${INSTALLCMD} -m 644 include/ctdb.h $(DESTDIR)$(includedir)
        ${INSTALLCMD} -m 644 include/ctdb_client.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 include/ctdb_typesafe_cb.h $(DESTDIR)$(includedir)
        ${INSTALLCMD} -m 644 config/functions $(DESTDIR)$(etcdir)/ctdb
        ${INSTALLCMD} -m 755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
        ${INSTALLCMD} -m 755 config/interface_modify.sh $(DESTDIR)$(etcdir)/ctdb