mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
tools: Do not add top-level tools dir to include path
Instead switch to an explicit -include $(XEN_ROOT)/tools/config.h to pickup config.h. Most places already do this, fixup the rest. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
Ian Campbell committed
1 parent
4219f4a20e
commit
89483dc2b3
10 files changed
+11
-18
No files matched your search
@@ -6,8 +6,8 @@ FS = ext2fs-lib
|
||||
|
||||
FS_LIBDEPS = $(EXTFS_LIBS)
|
||||
|
||||
# Include configure output (config.h) to headers search path
|
||||
CFLAGS += -I$(XEN_ROOT)/tools
|
||||
# Include configure output (config.h)
|
||||
CFLAGS += -include $(XEN_ROOT)/tools/config.h
|
||||
|
||||
.PHONY: all
|
||||
all: fs-all
|
||||
|
||||
@@ -21,9 +21,6 @@
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
|
||||
/* Include output from configure */
|
||||
#include <config.h>
|
||||
|
||||
#include <fsimage_plugin.h>
|
||||
#include INCLUDE_EXTFS_H
|
||||
#include <errno.h>
|
||||
|
||||
+3
-1
@@ -1,7 +1,9 @@
|
||||
XEN_ROOT=$(CURDIR)/../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
CFLAGS += -Werror -I$(XEN_ROOT)/tools
|
||||
CFLAGS += -Werror
|
||||
# Include configure output (config.h)
|
||||
CFLAGS += -include $(XEN_ROOT)/tools/config.h
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
|
||||
@@ -16,9 +16,6 @@
|
||||
* Place - Suite 330, Boston, MA 02111-1307 USA.
|
||||
*/
|
||||
|
||||
/* Include output from configure */
|
||||
#include <config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -2,7 +2,8 @@ XEN_ROOT = $(CURDIR)/../../..
|
||||
OCAML_TOPLEVEL = $(CURDIR)/..
|
||||
include $(OCAML_TOPLEVEL)/common.make
|
||||
|
||||
CFLAGS += -I$(XEN_ROOT)/tools/
|
||||
# Include configure output (config.h)
|
||||
CFLAGS += -include $(XEN_ROOT)/tools/config.h
|
||||
CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS)
|
||||
LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <caml/custom.h>
|
||||
#include <caml/signals.h>
|
||||
#include <caml/fail.h>
|
||||
#include <config.h>
|
||||
|
||||
#if defined(HAVE_SYSTEMD)
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat)
|
||||
LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(TINFO_LIBS) $(SOCKET_LIBS) -lm -lyajl
|
||||
CFLAGS += -DHOST_$(XEN_OS)
|
||||
|
||||
# Include configure output (config.h) to headers search path
|
||||
CFLAGS += -I$(XEN_ROOT)/tools
|
||||
# Include configure output (config.h)
|
||||
CFLAGS += -include $(XEN_ROOT)/tools/config.h
|
||||
LDFLAGS += $(APPEND_LDFLAGS)
|
||||
|
||||
.PHONY: all
|
||||
|
||||
@@ -19,9 +19,6 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
/* Include output from configure */
|
||||
#include <config.h>
|
||||
|
||||
/* get curses header from configure */
|
||||
#include INCLUDE_CURSES_H
|
||||
|
||||
|
||||
@@ -6,7 +6,8 @@ MINOR = 3
|
||||
|
||||
CFLAGS += -Werror
|
||||
CFLAGS += -I.
|
||||
CFLAGS += -I$(XEN_ROOT)/tools/
|
||||
# Include configure output (config.h)
|
||||
CFLAGS += -include $(XEN_ROOT)/tools/config.h
|
||||
CFLAGS += -I./include
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\""
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
#include <signal.h>
|
||||
#include <assert.h>
|
||||
#include <setjmp.h>
|
||||
#include <config.h>
|
||||
|
||||
#include "utils.h"
|
||||
#include "list.h"
|
||||
|
||||