summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2014-05-13 23:13:13 +1000
committerMichael Adam <obnox@samba.org>2014-05-27 13:43:11 +0200
commit6edbbce887d4af28b026a43059cd339fb3674932 (patch)
treea853ee5f70a8cddd5bdd983a6f950312be6d2ee8
parentf4b06b0ec4ee1af5368e2fc171d7f7809bf0697a (diff)
downloadsamba-6edbbce887d4af28b026a43059cd339fb3674932.tar.gz
samba-6edbbce887d4af28b026a43059cd339fb3674932.tar.xz
samba-6edbbce887d4af28b026a43059cd339fb3674932.zip
ctdb-build: Move internal include files in a separate directory
This will allow to build clustered samba with built-in ctdb tree rather than needing to install CTDB first. Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Michael Adam <obnox@samba.org>
-rwxr-xr-xctdb/Makefile.in3
-rw-r--r--ctdb/include/internal/cmdline.h (renamed from ctdb/include/cmdline.h)0
-rw-r--r--ctdb/include/internal/idtree.h (renamed from ctdb/include/idtree.h)0
-rw-r--r--ctdb/include/internal/includes.h (renamed from ctdb/include/includes.h)0
4 files changed, 2 insertions, 1 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 6fa93a4d2ad..f3cd70c3bdb 100755
--- 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\" \
diff --git a/ctdb/include/cmdline.h b/ctdb/include/internal/cmdline.h
index 785595ee6ca..785595ee6ca 100644
--- a/ctdb/include/cmdline.h
+++ b/ctdb/include/internal/cmdline.h
diff --git a/ctdb/include/idtree.h b/ctdb/include/internal/idtree.h
index 259af910056..259af910056 100644
--- a/ctdb/include/idtree.h
+++ b/ctdb/include/internal/idtree.h
diff --git a/ctdb/include/includes.h b/ctdb/include/internal/includes.h
index 37471982de2..37471982de2 100644
--- a/ctdb/include/includes.h
+++ b/ctdb/include/internal/includes.h