diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-01-16 09:55:05 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-01-16 09:55:05 +0100 |
| commit | 943da2282a3c370a33157e9c77a24d5f2f791538 (patch) | |
| tree | 6cd4d6a771d9d2ebd226b170060b89c008d8aa45 | |
| parent | 3d4a6199ad1311e86317152e30a7f888ab36c60f (diff) | |
| download | xen-943da2282a3c370a33157e9c77a24d5f2f791538.tar.gz xen-943da2282a3c370a33157e9c77a24d5f2f791538.tar.bz2 xen-943da2282a3c370a33157e9c77a24d5f2f791538.zip | |
fix compat header generation after 24503:86b8a1e3a419
At once also remove the duplicate forced inclusion of
public/xen-compat.h there (it's already done through cppflags-y) and
convert --include to the canonical -include in said c/s' adjustments
to CFLAGS-y and AFLAGS-y.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
| -rw-r--r-- | xen/Rules.mk | 4 | ||||
| -rw-r--r-- | xen/include/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xen/Rules.mk b/xen/Rules.mk index 37c6a79987..507e9abe38 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -41,7 +41,7 @@ ALL_OBJS-y += $(BASEDIR)/xsm/built_in.o ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o -CFLAGS-y += -g -D__XEN__ --include $(BASEDIR)/include/xen/config.h +CFLAGS-y += -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c CFLAGS-$(FLASK_ENABLE) += -DFLASK_DEVELOP -DFLASK_BOOTPARAM -DFLASK_AVC_STATS @@ -59,7 +59,7 @@ ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif -AFLAGS-y += -D__ASSEMBLY__ --include $(BASEDIR)/include/xen/config.h +AFLAGS-y += -D__ASSEMBLY__ -include $(BASEDIR)/include/xen/config.h # Clang's built-in assembler can't handle .code16/.code32/.code64 yet AFLAGS-$(clang) += -no-integrated-as diff --git a/xen/include/Makefile b/xen/include/Makefile index 420294cc99..004c9ccef5 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -57,7 +57,7 @@ compat/%.h: compat/%.i Makefile $(BASEDIR)/tools/compat-build-header.py mv -f $@.new $@ compat/%.i: compat/%.c Makefile - $(CPP) -include public/xen-compat.h $(filter-out -M% .%.d,$(CFLAGS)) $(cppflags-y) -o $@ $< + $(CPP) $(filter-out -M% .%.d -include %/include/xen/config.h,$(CFLAGS)) $(cppflags-y) -o $@ $< compat/%.c: public/%.h xlat.lst Makefile $(BASEDIR)/tools/compat-build-source.py mkdir -p $(@D) |