diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | tools/Rules.mk | 7 | ||||
| -rw-r--r-- | xen/Makefile | 9 |
3 files changed, 15 insertions, 12 deletions
@@ -22,7 +22,7 @@ endif install: install-xen install-kernels install-tools install-docs .PHONY: build -build: kernels build-headers +build: kernels $(MAKE) -C xen build $(MAKE) -C tools build $(MAKE) -C docs build @@ -59,11 +59,11 @@ prep-kernels: for i in $(XKERNELS) ; do $(MAKE) $$i-prep || exit 1; done .PHONY: install-xen -install-xen: build-headers +install-xen: $(MAKE) -C xen install .PHONY: install-tools -install-tools: build-headers +install-tools: $(MAKE) -C tools install .PHONY: install-kernels @@ -82,11 +82,6 @@ dev-docs: .PHONY: kbuild kbuild: kernels -# generate header files -.PHONY: build-headers -build-headers: - $(MAKE) -C xen/include/public/foreign - # Delete the kernel build trees entirely .PHONY: kdelete kdelete: diff --git a/tools/Rules.mk b/tools/Rules.mk index 581b670568..6c8049bc10 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -32,7 +32,7 @@ CFLAGS += $(CFLAGS-y) %.o: %.cc $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< -.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS) +.PHONY: mk-symlinks mk-symlinks-xen mk-symlinks-$(XEN_OS) mk-foreign-headers mk-symlinks-SunOS: @@ -43,7 +43,7 @@ mk-symlinks-Linux: ln -sf ../../$(LINUX_ROOT)/include/xen/public/*.h . ) ( cd xen && rm -f sys && ln -sf linux sys ) -mk-symlinks-xen: +mk-symlinks-xen: mk-foreign-headers mkdir -p xen ( cd xen && ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . ) mkdir -p xen/hvm @@ -55,4 +55,7 @@ mk-symlinks-xen: mkdir -p xen/foreign ( cd xen/foreign && ln -sf ../../$(XEN_ROOT)/xen/include/public/foreign/*.h . ) +mk-foreign-headers: + make -C $(XEN_ROOT)/xen/include/public/foreign + mk-symlinks: mk-symlinks-xen mk-symlinks-$(XEN_OS) diff --git a/xen/Makefile b/xen/Makefile index bd6a26dfaf..ae2a41408c 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -22,7 +22,7 @@ build install debug clean distclean cscope TAGS tags MAP:: _build: $(TARGET).gz .PHONY: _install -_install: $(TARGET).gz +_install: $(TARGET).gz build-headers [ -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 @@ -69,7 +69,7 @@ $(TARGET).gz: $(TARGET) gzip -f -9 < $< > $@.new mv $@.new $@ -$(TARGET): delete-unfresh-files +$(TARGET): delete-unfresh-files build-headers $(MAKE) -C tools $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/acm_policy.h @@ -133,6 +133,11 @@ 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 = acm arch/$(TARGET_ARCH) common drivers define all_sources ( find include/asm-$(TARGET_ARCH) -name '*.h' -print; \ |