ctdb-build: Move internal include files in a separate directory

[samba.git] / ctdb / Makefile.in

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 94904bda04e10ff69fa4ebe42e51848d46c61e2a..f3cd70c3bdba0d45db06d985eb45ad7d4c618c3e 100755 (executable)
--- a/ctdb/Makefile.in
+++ b/ctdb/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\" \
@@ -158,6 +159,9 @@ $(CTDB_VERSION_H):
        @echo Generating $@
        $(WRAPPER) ./packaging/mkversion.sh
 
+server/ctdb_daemon.c: $(CTDB_VERSION_H)
+tools/ctdb.c: $(CTDB_VERSION_H)
+
 bin/ctdbd: $(CTDB_SERVER_OBJ)
        @echo Linking $@
        $(WRAPPER) $(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
@@ -178,9 +182,9 @@ bin/ctdb_lock_helper: server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTE
        @echo Linking $@
        $(WRAPPER) $(CC) $(CFLAGS) -o $@ server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ) $(TDB_LIBS) $(LIB_FLAGS)
 
-bin/ctdb_event_helper: server/ctdb_event_helper.o $(SOCKET_WRAPPER_OBJ)
+bin/ctdb_event_helper: server/ctdb_event_helper.o $(REPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
        @echo Linking $@
-       $(WRAPPER) $(CC) $(CFLAGS) -o $@ server/ctdb_event_helper.o  $(SOCKET_WRAPPER_OBJ) $(LIB_FLAGS)
+       $(WRAPPER) $(CC) $(CFLAGS) -o $@ server/ctdb_event_helper.o $(REPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(LIB_FLAGS)
 
 bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
        @echo Linking $@
@@ -315,6 +319,7 @@ distclean: clean
        rm -rf bin
        rm -f config.log config.status config.cache config.h
        rm -f Makefile
+       rm -f $(CTDB_VERSION_H)
 
 install: all manpages $(PMDA_INSTALL)
        mkdir -p $(DESTDIR)$(libdir)/pkgconfig