ping_pong: Fix CID 1273087 Resource leak

[ctdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 06d60f04120c1011a69ef8239a95b469d45148e3..01b9e50531b569d1258940c3a5996ef48289f874 100755 (executable)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,8 @@ ifeq ($(CC),gcc)
 EXTRA_CFLAGS=-Wno-format-zero-length -Wno-deprecated-declarations -fPIC
 endif
 
-CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
+CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -I$(srcdir)/include/internal \
+       -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \
        -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
        -DCTDB_VARDIR=\"$(localstatedir)/lib/ctdb\" \
@@ -80,7 +81,7 @@ LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) $(TALLOC_LIBS) $(TEVENT_LIBS) $(TD
 
 CTDB_VERSION_H = include/ctdb_version.h
 
-UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util.o \
+UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/util.o \
        lib/util/util_time.o lib/util/util_file.o lib/util/fault.o lib/util/substitute.o \
        lib/util/signal.o
 
@@ -160,6 +161,9 @@ $(CTDB_VERSION_H):
        @echo Generating $@
        $(WRAPPER) ./packaging/mkversion.sh
 
+server/ctdb_daemon.o: $(CTDB_VERSION_H)
+tools/ctdb.o: $(CTDB_VERSION_H)
+
 bin/ctdbd: $(CTDB_SERVER_OBJ)
        @echo Linking $@
        $(WRAPPER) $(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
@@ -174,7 +178,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o tools/ctdb_vacuum.o
 
 bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ)
        @echo Linking $@
-       $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
+       $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(LIB_FLAGS)
 
 HELPER_COMMON_OBJ = common/system_util.o common/ctdb_logging.o \
                    lib/util/debug.o lib/util/util_time.o lib/util/util_file.o
@@ -387,6 +391,7 @@ install: all manpages $(PMDA_INSTALL)
        if [ -f doc/ping_pong.1 ];then ${INSTALLCMD} -m 644 doc/ping_pong.1 $(DESTDIR)$(mandir)/man1; fi
        if [ -f doc/ctdb.7 ]; then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man7; fi
        if [ -f doc/ctdb.7 ]; then ${INSTALLCMD} -m 644 doc/ctdb.7 $(DESTDIR)$(mandir)/man7; fi
+       if [ -f doc/ctdb-statistics.7 ]; then ${INSTALLCMD} -m 644 doc/ctdb-statistics.7 $(DESTDIR)$(mandir)/man7; fi
        if [ -f doc/ctdb-tunables.7 ]; then ${INSTALLCMD} -m 644 doc/ctdb-tunables.7 $(DESTDIR)$(mandir)/man7; fi
        if [ -f doc/ctdbd.conf.5 ]; then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man5; fi
        if [ -f doc/ctdbd.conf.5 ]; then ${INSTALLCMD} -m 644 doc/ctdbd.conf.5 $(DESTDIR)$(mandir)/man5; fi