X-Git-Url: http://git.samba.org/?p=metze%2Fctdb%2Fwip.git;a=blobdiff_plain;f=Makefile.in;h=b72e90eecc755f2fde890911dce0ebfad6d33b55;hp=a32efa8c43240cbd94f06b06273b6d0e473f59c0;hb=01c2acdf3cb29bb44c74d9d792cf1d3706534ad2;hpb=abf4540bfb06de56b0a7b5976b5f1b2a24a8743d diff --git a/Makefile.in b/Makefile.in index a32efa8c..b72e90ee 100755 --- 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@ @@ -35,11 +38,16 @@ CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \ LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@ UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util.o \ - lib/util/util_time.o lib/util/util_file.o + 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 + 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 CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o @@ -54,10 +62,11 @@ CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \ server/ctdb_traverse.o server/eventscript.o server/ctdb_takeover.o \ server/ctdb_serverids.o server/ctdb_persistent.o \ server/ctdb_keepalive.o server/ctdb_logging.o server/ctdb_uptime.o \ - server/ctdb_vacuum.o \ + server/ctdb_vacuum.o server/ctdb_banning.o \ $(CTDB_CLIENT_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@ -TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_store \ +TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_fetch_one \ + tests/bin/ctdb_store \ tests/bin/ctdb_randrec tests/bin/ctdb_persistent \ tests/bin/ctdb_traverse tests/bin/rb_test tests/bin/ctdb_transaction \ @INFINIBAND_BINS@ @@ -69,7 +78,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:' @@ -99,6 +108,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) @@ -142,6 +157,10 @@ tests/bin/ctdb_fetch: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) +tests/bin/ctdb_fetch_one: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_one.o + @echo Linking $@ + @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) + tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) @@ -177,7 +196,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) @@ -200,23 +219,31 @@ 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 ${INSTALLCMD} -m 644 config/events.d/README $(DESTDIR)$(docdir)/ctdb/README.eventscripts ${INSTALLCMD} -m 644 doc/recovery-process.txt $(DESTDIR)$(docdir)/ctdb/recovery-process.txt ${INSTALLCMD} -m 755 config/events.d/00.ctdb $(DESTDIR)$(etcdir)/ctdb/events.d + ${INSTALLCMD} -m 755 config/events.d/01.reclock $(DESTDIR)$(etcdir)/ctdb/events.d ${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/20.multipathd $(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 ${INSTALLCMD} -m 755 config/events.d/41.httpd $(DESTDIR)$(etcdir)/ctdb/events.d ${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) @@ -226,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