[Xen-changelog] [xen-unstable] fix compat header generation after 24503:86b8a1e3a419

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1326704105 -3600
# Node ID 0d4a60bf37b95b58bbae7019e0c263c556999131
# Parent  ffe158446c79a318a2f878dc938c0e61f46694e0
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@xxxxxxxx>
---


diff -r ffe158446c79 -r 0d4a60bf37b9 xen/Rules.mk
--- a/xen/Rules.mk      Sun Jan 15 22:05:12 2012 +0000
+++ b/xen/Rules.mk      Mon Jan 16 09:55:05 2012 +0100
@@ -41,7 +41,7 @@
 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 @@
 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 -r ffe158446c79 -r 0d4a60bf37b9 xen/include/Makefile
--- a/xen/include/Makefile      Sun Jan 15 22:05:12 2012 +0000
+++ b/xen/include/Makefile      Mon Jan 16 09:55:05 2012 +0100
@@ -57,7 +57,7 @@
        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)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog