From 6edbbce887d4af28b026a43059cd339fb3674932 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 13 May 2014 23:13:13 +1000 Subject: [PATCH 1/1] 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 Reviewed-by: Michael Adam --- ctdb/Makefile.in | 3 ++- ctdb/include/{ => internal}/cmdline.h | 0 ctdb/include/{ => internal}/idtree.h | 0 ctdb/include/{ => internal}/includes.h | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename ctdb/include/{ => internal}/cmdline.h (100%) rename ctdb/include/{ => internal}/idtree.h (100%) rename ctdb/include/{ => internal}/includes.h (100%) 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 similarity index 100% rename from ctdb/include/cmdline.h rename to ctdb/include/internal/cmdline.h diff --git a/ctdb/include/idtree.h b/ctdb/include/internal/idtree.h similarity index 100% rename from ctdb/include/idtree.h rename to ctdb/include/internal/idtree.h diff --git a/ctdb/include/includes.h b/ctdb/include/internal/includes.h similarity index 100% rename from ctdb/include/includes.h rename to ctdb/include/internal/includes.h -- 2.34.1