Xen project Mailing List

[Xen-changelog] [xen-unstable] Move generation of public header hierarchy into the tools.

From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>

Date: Sat, 26 Jan 2008 03:30:33 -0800

Delivery-date: Sat, 26 Jan 2008 03:31:34 -0800

List-id: BK change log <xen-changelog.lists.xensource.com>

# HG changeset patch # User Keir Fraser <keir.fraser@xxxxxxxxxx> # Date 1201343924 0 # Node ID b9004e222fde51c1f37c1631d6783e3397f2eb5e # Parent 3d71b7bf06eaa0f8054dd7585405d9e49425e20c Move generation of public header hierarchy into the tools. This patch merges the two versions of public header generation currently used in the build into one. Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx> --- xen/include/public/foreign/Makefile | 37 ----------------------------- .hgignore | 5 ++-- tools/Makefile | 1 tools/Rules.mk | 24 ------------------- tools/blktap/drivers/Makefile | 2 - tools/blktap/lib/Makefile | 2 - tools/console/Makefile | 1 tools/flask/libflask/Makefile | 2 - tools/flask/loadpolicy/Makefile | 1 tools/include/Makefile | 40 ++++++++++++++++++++++++++++++++ tools/include/xen-foreign/Makefile | 45 ++++++++++++++++++++++++++++++++++++ tools/ioemu/Makefile.target | 1 tools/libxc/Makefile | 6 ++-- tools/misc/Makefile | 1 tools/python/setup.py | 1 tools/xcutils/Makefile | 2 - tools/xenmon/Makefile | 1 tools/xenstat/libxenstat/Makefile | 2 - tools/xenstore/Makefile | 1 tools/xentrace/Makefile | 1 xen/Makefile | 27 +-------------------- 21 files changed, 108 insertions(+), 95 deletions(-) diff -r 3d71b7bf06ea -r b9004e222fde .hgignore --- a/.hgignore Sat Jan 26 10:17:33 2008 +0000 +++ b/.hgignore Sat Jan 26 10:38:44 2008 +0000 @@ -118,6 +118,9 @@ ^tools/firmware/vmxassist/offsets\.h$ ^tools/firmware/vmxassist/vmxassist$ ^tools/flask/loadpolicy/flask-loadpolicy$ +^tools/include/\.dir$ +^tools/include/xen-foreign/.*\.(c|h|size)$ +^tools/include/xen-foreign/checker$ ^tools/ioemu/\.pc/.*$ ^tools/ioemu/config-host\.h$ ^tools/ioemu/config-host\.mak$ @@ -227,8 +230,6 @@ ^xen/include/asm-ia64/asm-xsi-offsets\.h$ ^xen/include/compat/.*$ ^xen/include/hypervisor-ifs/arch$ -^xen/include/public/foreign/.*\.(c|h|size)$ -^xen/include/public/foreign/checker$ ^xen/include/public/public$ ^xen/include/xen/.*\.new$ ^xen/include/xen/acm_policy\.h$ diff -r 3d71b7bf06ea -r b9004e222fde tools/Makefile --- a/tools/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -2,6 +2,7 @@ include $(XEN_ROOT)/tools/Rules.mk include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := +SUBDIRS-y += include SUBDIRS-y += libxc SUBDIRS-y += flask SUBDIRS-y += xenstore diff -r 3d71b7bf06ea -r b9004e222fde tools/Rules.mk --- a/tools/Rules.mk Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/Rules.mk Sat Jan 26 10:38:44 2008 +0000 @@ -5,6 +5,7 @@ all: include $(XEN_ROOT)/Config.mk +XEN_INCLUDE = $(XEN_ROOT)/tools/include XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore @@ -37,26 +38,3 @@ check-$(CONFIG_X86) = $(call cc-ver-chec %.o: %.cc $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< -.PHONY: mk-symlinks - -mk-symlinks: - mkdir -p xen/sys - ( cd xen/sys && \ - ln -sf ../../$(XEN_ROOT)/tools/include/$(XEN_OS)/*.h . ) - mkdir -p xen - ( cd xen && ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . ) - mkdir -p xen/hvm - ( cd xen/hvm && ln -sf ../../$(XEN_ROOT)/xen/include/public/hvm/*.h . ) - mkdir -p xen/io - ( cd xen/io && ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . ) - mkdir -p xen/xsm - ( cd xen/xsm && ln -sf ../../$(XEN_ROOT)/xen/include/public/xsm/*.h . ) - mkdir -p xen/arch-x86 - ( cd xen/arch-x86 && ln -sf ../../$(XEN_ROOT)/xen/include/public/arch-x86/*.h . ) - mkdir -p xen/arch-ia64 - ( cd xen/arch-ia64 && ln -sf ../../$(XEN_ROOT)/xen/include/public/arch-ia64/*.h . ) - mkdir -p xen/foreign - ( cd xen/foreign && ln -sf ../../$(XEN_ROOT)/xen/include/public/foreign/Makefile . ) - ( cd xen/foreign && ln -sf ../../$(XEN_ROOT)/xen/include/public/foreign/reference.size . ) - ( cd xen/foreign && ln -sf ../../$(XEN_ROOT)/xen/include/public/foreign/*.py . ) - $(MAKE) -C xen/foreign diff -r 3d71b7bf06ea -r b9004e222fde tools/blktap/drivers/Makefile --- a/tools/blktap/drivers/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/blktap/drivers/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -1,7 +1,7 @@ XEN_ROOT = ../../.. XEN_ROOT = ../../.. include $(XEN_ROOT)/tools/Rules.mk -INCLUDES += -I.. -I../lib +INCLUDES += -I.. -I../lib -I$(XEN_INCLUDE) IBIN = blktapctrl tapdisk QCOW_UTIL = img2qcow qcow2raw qcow-create diff -r 3d71b7bf06ea -r b9004e222fde tools/blktap/lib/Makefile --- a/tools/blktap/lib/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/blktap/lib/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -5,7 +5,7 @@ MINOR = 0 MINOR = 0 SONAME = libblktap.so.$(MAJOR) -INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE) +INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE) LIBS := -lxenstore diff -r 3d71b7bf06ea -r b9004e222fde tools/console/Makefile --- a/tools/console/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/console/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -8,6 +8,7 @@ CFLAGS += -Werror CFLAGS += -I $(XEN_LIBXC) CFLAGS += -I $(XEN_XENSTORE) +CFLAGS += -I $(XEN_INCLUDE) BIN = xenconsoled xenconsole diff -r 3d71b7bf06ea -r b9004e222fde tools/flask/libflask/Makefile --- a/tools/flask/libflask/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/flask/libflask/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -11,7 +11,7 @@ SRCS += flask_op.c CFLAGS += -Werror CFLAGS += -fno-strict-aliasing -CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) +CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE) # Get gcc to generate the dependencies for us. CFLAGS += -Wp,-MD,.$(@F).d diff -r 3d71b7bf06ea -r b9004e222fde tools/flask/loadpolicy/Makefile --- a/tools/flask/loadpolicy/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/flask/loadpolicy/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -15,6 +15,7 @@ BASECFLAGS+= -I$(LIBXC_ROOT) BASECFLAGS+= -I$(LIBXC_ROOT) BASECFLAGS+= -I$(LIBFLASK_ROOT)/include BASECFLAGS+= -I. +BASECFLAGS+= -I$(XEN_INCLUDE) CFLAGS += $(BASECFLAGS) LDFLAGS += $(PROFILE) -L$(XEN_LIBXC) -L$(LIBFLASK_ROOT) diff -r 3d71b7bf06ea -r b9004e222fde tools/include/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -0,0 +1,40 @@ +XEN_ROOT = ../.. +include $(XEN_ROOT)/tools/Rules.mk + +.PHONY: all +all: + $(MAKE) .dir + +.dir: + @rm -rf xen + mkdir xen + ln -sf ../$(XEN_ROOT)/xen/include/public/COPYING xen + ln -sf $(addprefix ../,$(wildcard $(XEN_ROOT)/xen/include/public/*.h)) xen + ln -sf $(addprefix ../$(XEN_ROOT)/xen/include/public/,arch-ia64 arch-x86 hvm io xsm) xen + ln -sf ../$(XEN_OS) xen/sys + $(MAKE) -C xen-foreign + ln -s ../xen-foreign xen/foreign + touch $@ + +.PHONY: install +install: all + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-ia64 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/hvm + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/xsm + $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(INCLUDEDIR)/xen + $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen + $(INSTALL_DATA) xen/arch-ia64/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 + $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 + $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign + $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/hvm + $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(INCLUDEDIR)/xen/io + $(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm + +.PHONY: clean +clean: + rm -rf xen .dir + $(MAKE) -C xen-foreign clean + diff -r 3d71b7bf06ea -r b9004e222fde tools/include/xen-foreign/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/include/xen-foreign/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -0,0 +1,45 @@ +XEN_ROOT=../../.. +include $(XEN_ROOT)/Config.mk + +ROOT = $(XEN_ROOT)/xen/include/public/foreign +#VPATH = $(ROOT) +HOSTCFLAGS += -I$(ROOT) + +MKHEADER_PY = $(ROOT)/mkheader.py + +architectures := x86_32 x86_64 ia64 +headers := $(patsubst %, %.h, $(architectures)) +scripts := $(wildcard *.py) + +.PHONY: all clean check-headers +all: $(headers) check-headers + +clean: + rm -f $(headers) + rm -f checker checker.c + rm -f *.pyc *.o *~ + +ifeq ($(CROSS_COMPILE)$(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) +checker: checker.c $(headers) + $(HOSTCC) $(HOSTCFLAGS) -o $@ $< + +check-headers: checker + ./checker > tmp.size + diff -u $(ROOT)/reference.size tmp.size + rm tmp.size +else +check-headers: + @echo "cross build: skipping check" +endif + +x86_32.h: $(ROOT)/mkheader.py ../xen/arch-x86/xen-x86_32.h ../xen/arch-x86/xen.h ../xen/xen.h + python $< $* $@ $(filter %.h,$^) + +x86_64.h: $(ROOT)/mkheader.py ../xen/arch-x86/xen-x86_64.h ../xen/arch-x86/xen.h ../xen/xen.h + python $< $* $@ $(filter %.h,$^) + +ia64.h: $(ROOT)/mkheader.py ../xen/arch-ia64.h ../xen/xen.h + python $< $* $@ $(filter %.h,$^) + +checker.c: $(ROOT)/mkchecker.py + python $< $(XEN_TARGET_ARCH) $@ $(architectures) diff -r 3d71b7bf06ea -r b9004e222fde tools/ioemu/Makefile.target --- a/tools/ioemu/Makefile.target Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/ioemu/Makefile.target Sat Jan 26 10:38:44 2008 +0000 @@ -18,6 +18,7 @@ CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(S CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS+= -I$(XEN_ROOT)/tools/include ifdef CONFIG_DARWIN_USER VPATH+=:$(SRC_PATH)/darwin-user CPPFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH) diff -r 3d71b7bf06ea -r b9004e222fde tools/libxc/Makefile --- a/tools/libxc/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/libxc/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -50,7 +50,7 @@ GUEST_SRCS-$(CONFIG_POWERPC) += xc_dom_p -include $(XEN_TARGET_ARCH)/Makefile CFLAGS += -Werror -Wmissing-prototypes -CFLAGS += $(INCLUDES) -I. -I../xenstore +CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include # Needed for posix_fadvise64() in xc_linux.c CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE @@ -80,7 +80,7 @@ all: build all: build .PHONY: build -build: check-for-zlib mk-symlinks +build: check-for-zlib $(MAKE) $(LIB) .PHONY: check-for-zlib @@ -114,7 +114,7 @@ TAGS: .PHONY: clean clean: - rm -rf *.rpm $(LIB) *~ $(DEPS) xen \ + rm -rf *.rpm $(LIB) *~ $(DEPS) \ $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \ $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS) diff -r 3d71b7bf06ea -r b9004e222fde tools/misc/Makefile --- a/tools/misc/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/misc/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -5,6 +5,7 @@ CFLAGS += -Werror INCLUDES += -I $(XEN_XC) INCLUDES += -I $(XEN_LIBXC) +INCLUDES += -I $(XEN_INCLUDE) CFLAGS += $(INCLUDES) HDRS = $(wildcard *.h) diff -r 3d71b7bf06ea -r b9004e222fde tools/python/setup.py --- a/tools/python/setup.py Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/python/setup.py Sat Jan 26 10:38:44 2008 +0000 @@ -8,6 +8,7 @@ extra_compile_args = [ "-fno-strict-ali include_dirs = [ XEN_ROOT + "/tools/libxc", XEN_ROOT + "/tools/xenstore", + XEN_ROOT + "/tools/include", ] library_dirs = [ XEN_ROOT + "/tools/libxc", diff -r 3d71b7bf06ea -r b9004e222fde tools/xcutils/Makefile --- a/tools/xcutils/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/xcutils/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -13,7 +13,7 @@ include $(XEN_ROOT)/tools/Rules.mk PROGRAMS_INSTALL_DIR = $(LIBDIR)/xen/bin -INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE) +INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE) -I$(XEN_INCLUDE) CFLAGS += -Werror CFLAGS += $(INCLUDES) diff -r 3d71b7bf06ea -r b9004e222fde tools/xenmon/Makefile --- a/tools/xenmon/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/xenmon/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -16,6 +16,7 @@ CFLAGS += -Werror CFLAGS += -Werror CFLAGS += -I $(XEN_XC) CFLAGS += -I $(XEN_LIBXC) +CFLAGS += -I $(XEN_INCLUDE) LDFLAGS += -L $(XEN_LIBXC) BIN = xentrace_setmask xenbaked diff -r 3d71b7bf06ea -r b9004e222fde tools/xenstat/libxenstat/Makefile --- a/tools/xenstat/libxenstat/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/xenstat/libxenstat/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -36,7 +36,7 @@ SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,li WARN_FLAGS=-Wall -Werror -CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) +CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE) LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ LDLIBS-y = -lxenstore -lxenctrl LDLIBS-$(CONFIG_SunOS) += -lkstat diff -r 3d71b7bf06ea -r b9004e222fde tools/xenstore/Makefile --- a/tools/xenstore/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/xenstore/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -13,6 +13,7 @@ BASECFLAGS+= $(PROFILE) BASECFLAGS+= $(PROFILE) BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc BASECFLAGS+= -I. +BASECFLAGS+= -I$(XEN_INCLUDE) CFLAGS += $(BASECFLAGS) LDFLAGS += $(PROFILE) -L$(XEN_LIBXC) diff -r 3d71b7bf06ea -r b9004e222fde tools/xentrace/Makefile --- a/tools/xentrace/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/tools/xentrace/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -5,6 +5,7 @@ CFLAGS += -Werror CFLAGS += -I $(XEN_XC) CFLAGS += -I $(XEN_LIBXC) +CFLAGS += -I $(XEN_INCLUDE) HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) diff -r 3d71b7bf06ea -r b9004e222fde xen/Makefile --- a/xen/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ b/xen/Makefile Sat Jan 26 10:38:44 2008 +0000 @@ -22,30 +22,13 @@ _build: $(TARGET).gz _build: $(TARGET).gz .PHONY: _install -_install: $(TARGET).gz build-headers +_install: $(TARGET).gz [ -d $(DESTDIR)/boot ] || $(INSTALL_DIR) $(DESTDIR)/boot $(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_FULLVERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz $(DESTDIR)/boot/$(notdir $(TARGET)).gz $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir $(TARGET))-syms-$(XEN_FULLVERSION) - [ -d $(DESTDIR)/usr/include/xen/arch-x86 ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/arch-x86 - [ -d $(DESTDIR)/usr/include/xen/hvm ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/hvm - [ -d $(DESTDIR)/usr/include/xen/io ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io - [ -d $(DESTDIR)/usr/include/xen/xsm ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/xsm - [ -d $(DESTDIR)/usr/include/xen/foreign ] || \ - $(INSTALL_DIR) $(DESTDIR)/usr/include/xen/foreign - $(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen - $(INSTALL_DATA) include/public/arch-x86/*.h $(DESTDIR)/usr/include/xen/arch-x86 - $(INSTALL_DATA) include/public/hvm/*.h $(DESTDIR)/usr/include/xen/hvm - $(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io - $(INSTALL_DATA) include/public/xsm/*.h $(DESTDIR)/usr/include/xen/xsm - $(INSTALL_DATA) include/public/foreign/*.h $(DESTDIR)/usr/include/xen/foreign - $(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen .PHONY: _debug _debug: @@ -54,7 +37,6 @@ _debug: .PHONY: _clean _clean: delete-unfresh-files $(MAKE) -C tools clean - $(MAKE) -C include/public/foreign clean $(MAKE) -f $(BASEDIR)/Rules.mk -C include clean $(MAKE) -f $(BASEDIR)/Rules.mk -C common clean $(MAKE) -f $(BASEDIR)/Rules.mk -C drivers clean @@ -71,7 +53,7 @@ _distclean: clean gzip -f -9 < $< > $@.new mv $@.new $@ -$(TARGET): delete-unfresh-files build-headers +$(TARGET): delete-unfresh-files $(MAKE) -C tools $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm @@ -120,11 +102,6 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h echo ""; \ echo "#endif") <$< >$@ -# generate header files -.PHONY: build-headers -build-headers: - $(MAKE) -C include/public/foreign - SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers define all_sources ( find include/asm-$(TARGET_ARCH) -name '*.h' -print; \ diff -r 3d71b7bf06ea -r b9004e222fde xen/include/public/foreign/Makefile --- a/xen/include/public/foreign/Makefile Sat Jan 26 10:17:33 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -XEN_ROOT=../../../.. -include $(XEN_ROOT)/Config.mk - -architectures := x86_32 x86_64 ia64 -headers := $(patsubst %, %.h, $(architectures)) -scripts := $(wildcard *.py) - -.PHONY: all clean check-headers -all: $(headers) check-headers - -clean: - rm -f $(headers) - rm -f checker checker.c $(XEN_TARGET_ARCH).size - rm -f *.pyc *.o *~ - -ifeq ($(CROSS_COMPILE)$(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) -check-headers: checker - ./checker > $(XEN_TARGET_ARCH).size - diff -u reference.size $(XEN_TARGET_ARCH).size -checker: checker.c $(headers) - $(HOSTCC) $(HOSTCFLAGS) -o $@ $< -else -check-headers: - @echo "cross build: skipping check" -endif - -x86_32.h: ../arch-x86/xen-x86_32.h ../arch-x86/xen.h ../xen.h $(scripts) - python mkheader.py $* $@ $(filter %.h,$^) - -x86_64.h: ../arch-x86/xen-x86_64.h ../arch-x86/xen.h ../xen.h $(scripts) - python mkheader.py $* $@ $(filter %.h,$^) - -ia64.h: ../arch-ia64.h ../xen.h $(scripts) - python mkheader.py $* $@ $(filter %.h,$^) - -checker.c: $(scripts) - python mkchecker.py $(XEN_TARGET_ARCH) $@ $(architectures) _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.