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@debian.org>

diff --git a/.hgignore b/.hgignore
index 028fd59339bc6aa98e2480a816dc3b7e6693b9f3..e0bd8124b55f8b33c3a6ff8b14c0898f075b7b09 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -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 --git a/tools/Makefile b/tools/Makefile
index fddf7e580156d3f2e7de42bde1b5d78804b778b5..d75b35cfab9211fdd3f16e44f99358006fcdef05 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,6 +2,7 @@ XEN_ROOT = ../
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=
+SUBDIRS-y += include
 SUBDIRS-y += libxc
 SUBDIRS-y += flask
 SUBDIRS-y += xenstore

diff --git a/tools/Rules.mk b/tools/Rules.mk
index ec121f645eb4de91b172135c7def4711058668dd..007a844af9349755336b00f2423cb2b41b9cdeb6 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -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 @@ $(eval $(check-y))
 %.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 --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index cfd41f64987f23226949b402d6c1766d243c3444..5376b6904baae3c61a24e4fb6fd35f1dd0ff20a0 100644 (file)
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -1,7 +1,7 @@
 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 --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 008baac776368f953a95d05a405e9c89102a38e9..ce6342c153a3efe8c7e644c3d8de5b6039411ec9 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -5,7 +5,7 @@ MAJOR    = 3.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 --git a/tools/console/Makefile b/tools/console/Makefile
index 4ee3d0a816d755400b96aadb5cc0e65e9df8835d..85c2ad85749c32d68fc7574b316e55833ec50add 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -8,6 +8,7 @@ CFLAGS  += -Werror
 
 CFLAGS  += -I $(XEN_LIBXC)
 CFLAGS  += -I $(XEN_XENSTORE)
+CFLAGS  += -I $(XEN_INCLUDE)
 
 BIN      = xenconsoled xenconsole
 

diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile
index b6c086c0c2db8eed638b6445074bab989d2aab58..8c085b929b8dc495dd5a875c65ca67ad8757975d 100644 (file)
--- a/tools/flask/libflask/Makefile
+++ b/tools/flask/libflask/Makefile
@@ -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 --git a/tools/flask/loadpolicy/Makefile b/tools/flask/loadpolicy/Makefile
index bb0ead6846e90525e854a52709f7a3edb4d908e5..9845222759cdf317a34d84e45ba84a3cd57a26a7 100644 (file)
--- a/tools/flask/loadpolicy/Makefile
+++ b/tools/flask/loadpolicy/Makefile
@@ -15,6 +15,7 @@ BASECFLAGS+= $(PROFILE)
 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 --git a/tools/include/Makefile b/tools/include/Makefile
new file mode 100644 (file)
index 0000000..47a72a8
--- /dev/null
+++ b/tools/include/Makefile
@@ -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 --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile
new file mode 100644 (file)
index 0000000..394edb6
--- /dev/null
+++ b/tools/include/xen-foreign/Makefile
@@ -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 --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index c3bef4676118fff51f673b4ee678cb5c17e543de..ebd691b5f09934ff84b972f3531e862e9394cb33 100644 (file)
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -18,6 +18,7 @@ VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
 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 --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index e71b7a4e9ecbdd3849a381319129433ab6062445..d0b1168366312abbc9f03e6fc5670c81aded19a2 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -50,7 +50,7 @@ GUEST_SRCS-$(CONFIG_POWERPC) += xc_dom_powerpc.c
 -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 @@ LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
 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 --git a/tools/misc/Makefile b/tools/misc/Makefile
index 62f2acf5f0fd486d4a311de41300e5aa40e3115c..e0b38ee20ed83a394aebb324dbba3d46cda0052e 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -5,6 +5,7 @@ CFLAGS   += -Werror
 
 INCLUDES += -I $(XEN_XC)
 INCLUDES += -I $(XEN_LIBXC)
+INCLUDES += -I $(XEN_INCLUDE)
 CFLAGS   += $(INCLUDES)
 
 HDRS     = $(wildcard *.h)

diff --git a/tools/python/setup.py b/tools/python/setup.py
index 68ce0070d4cca7784b6f854c15394c1701a37eff..0afc168b665745f2d91acaa28146f2841a548014 100644 (file)
--- a/tools/python/setup.py
+++ b/tools/python/setup.py
@@ -8,6 +8,7 @@ extra_compile_args  = [ "-fno-strict-aliasing", "-Werror" ]
 
 include_dirs = [ XEN_ROOT + "/tools/libxc",
                  XEN_ROOT + "/tools/xenstore",
+                 XEN_ROOT + "/tools/include",
                  ]
 
 library_dirs = [ XEN_ROOT + "/tools/libxc",

diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index 9d70df4fba29f08a25677b380c9c5cd2ad2fa603..4c004750bf05b8a960e9c700510bcb08c9675863 100644 (file)
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -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 --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index ef0b36227c54dc1f5549d82334b092e8d14bd305..886d5b2d0229be302093406ff4170f03473db045 100644 (file)
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -16,6 +16,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 CFLAGS  += -Werror
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)
+CFLAGS  += -I $(XEN_INCLUDE)
 LDFLAGS += -L $(XEN_LIBXC)
 
 BIN = xentrace_setmask xenbaked

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 69cbf2fca7aa73863d79a10261845df89bff5c69..f60ec7872eba3f7c9ee7c6e8aa3ef06ce58d3adc 100644 (file)
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -36,7 +36,7 @@ SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
 
 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 --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 1fbd42ce12f4668f7a2a9b66cb28b457fffc314e..3b31e9a4b1b69f39cd9b1d681f70eaca06955456 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -13,6 +13,7 @@ PROG_DEP = .*.d
 BASECFLAGS+= $(PROFILE)
 BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
 BASECFLAGS+= -I.
+BASECFLAGS+= -I$(XEN_INCLUDE)
 
 CFLAGS  += $(BASECFLAGS)
 LDFLAGS += $(PROFILE) -L$(XEN_LIBXC)

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 022f01e08a9c0dd38a48dc3139ef957ca831635d..e4f27c673df69ad764219e854034d836d94e6242 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -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 --git a/xen/Makefile b/xen/Makefile
index 60b578c05147b0d911fe4b241f9b60935a3dc734..f2d2c7aa3c67882251607ebf8ff8248dcc4d00be 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -22,30 +22,13 @@ build install debug clean distclean cscope TAGS tags MAP::
 _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 @@ $(TARGET).gz: $(TARGET)
        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: arch/$(TARGET_ARCH)/asm-offsets.s
          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 --git a/xen/include/public/foreign/Makefile b/xen/include/public/foreign/Makefile
deleted file mode 100644 (file)
index 7bde873..0000000
--- a/xen/include/public/foreign/Makefile
+++ /dev/null
@@ -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)