[Qemu-devel] [PATCH 30/42] Rename CPPFLAGS to CFLAGS

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile                   |   12 ++++++------
 Makefile.hw                |    6 +++---
 Makefile.target            |   32 ++++++++++++++++----------------
 configure                  |    2 +-
 pc-bios/optionrom/Makefile |    6 +++---
 rules.mak                  |    6 +++---
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index dc85d01..62848f1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,9 @@ endif

 VPATH=$(SRC_PATH):$(SRC_PATH)/hw

-CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
-CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CPPFLAGS += -U_FORTIFY_SOURCE
+CFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CFLAGS += -U_FORTIFY_SOURCE
 LIBS+=-lz

 ifdef BUILD_DOCS
@@ -98,7 +98,7 @@ ifdef CONFIG_COREAUDIO
 AUDIO_PT = y
 endif
 ifdef CONFIG_FMOD
-audio/audio.o audio/fmodaudio.o: CPPFLAGS := $(FMOD_CFLAGS) $(CPPFLAGS)
+audio/audio.o audio/fmodaudio.o: CFLAGS := $(FMOD_CFLAGS) $(CFLAGS)
 endif
 ifdef CONFIG_ESD
 AUDIO_PT = y
@@ -135,7 +135,7 @@ obj-$(CONFIG_COCOA) += cocoa.o
 obj-$(CONFIG_IOTHREAD) += qemu-thread.o

 ifdef CONFIG_SLIRP
-CPPFLAGS+=-I$(SRC_PATH)/slirp
+CFLAGS+=-I$(SRC_PATH)/slirp
 endif

 slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o
@@ -149,7 +149,7 @@ LIBS+=$(VDE_LIBS)
 obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
 obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o

-CPPFLAGS+=$(CURL_CFLAGS)
+CFLAGS+=$(CURL_CFLAGS)
 LIBS+=$(CURL_LIBS)

 cocoa.o: cocoa.m
diff --git a/Makefile.hw b/Makefile.hw
index 131ae51..804ace1 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -8,9 +8,9 @@ include $(SRC_PATH)/rules.mak

 VPATH=$(SRC_PATH):$(SRC_PATH)/hw

-CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
-CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CPPFLAGS+=-I$(SRC_PATH)/fpu
+CFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CFLAGS+=-I$(SRC_PATH)/fpu

 obj-y =
 obj-y += virtio.o virtio-pci.o
diff --git a/Makefile.target b/Makefile.target
index 0bc46e0..f53bee2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -3,7 +3,7 @@ include $(SRC_PATH)/rules.mak

 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
-CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
+CFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H

 ifdef CONFIG_USER_ONLY
 # user emulator name
@@ -44,8 +44,8 @@ ifeq ($(ARCH),ia64)
 CFLAGS+=-mno-sdata
 endif

-CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CPPFLAGS+=-U_FORTIFY_SOURCE
+CFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CFLAGS+=-U_FORTIFY_SOURCE
 LIBS+=-lm
 ifdef CONFIG_SOLARIS
 ifdef CONFIG_NEEDS_LIBSUNMATH
@@ -68,16 +68,16 @@ libobj-y = exec.o translate-all.o cpu-exec.o translate.o 
host-utils.o
 libobj-$(CONFIG_KQEMU) += kqemu.o
 # TCG code generator
 libobj-y += tcg/tcg.o tcg/tcg-runtime.o
-CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
+CFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
 ifeq ($(ARCH),sparc64)
-CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc
+CFLAGS+=-I$(SRC_PATH)/tcg/sparc
 endif
 ifdef CONFIG_SOFTFLOAT
 libobj-y += fpu/softfloat.o
 else
 libobj-y += fpu/softfloat-native.o
 endif
-CPPFLAGS+=-I$(SRC_PATH)/fpu
+CFLAGS+=-I$(SRC_PATH)/fpu
 libobj-y += op_helper.o helper.o

 ifeq ($(TARGET_BASE_ARCH), arm)
@@ -161,7 +161,7 @@ cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)
 ifdef CONFIG_LINUX_USER

 VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
-CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
+CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)

 # profiling code
 ifdef TARGET_GPROF
@@ -203,7 +203,7 @@ endif #CONFIG_LINUX_USER
 ifdef CONFIG_DARWIN_USER

 VPATH+=:$(SRC_PATH)/darwin-user
-CPPFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH)
+CFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH)

 # Leave some space for the regular program loading zone
 LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000
@@ -227,7 +227,7 @@ endif #CONFIG_DARWIN_USER
 ifdef CONFIG_BSD_USER

 VPATH+=:$(SRC_PATH)/bsd-user
-CPPFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
+CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)

 obj-y = main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \
         gdbstub.o gdbstub-xml.o ioport-user.o
@@ -285,12 +285,12 @@ adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
 endif

 ifdef CONFIG_VNC_TLS
-CPPFLAGS += $(VNC_TLS_CFLAGS)
+CFLAGS += $(VNC_TLS_CFLAGS)
 LIBS += $(VNC_TLS_LIBS)
 endif

 ifdef CONFIG_VNC_SASL
-CPPFLAGS += $(VNC_SASL_CFLAGS)
+CFLAGS += $(VNC_SASL_CFLAGS)
 LIBS += $(VNC_SASL_LIBS)
 endif

@@ -325,7 +325,7 @@ obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o 
hpet.o
 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o

 ifeq ($(TARGET_BASE_ARCH), i386)
-CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
+CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif

 # shared objects
@@ -347,7 +347,7 @@ obj-ppc-y += ppce500_pci.o ppce500_mpc8544ds.o
 obj-ppc-$(CONFIG_KVM) += kvm_ppc.o

 ifeq ($(TARGET_BASE_ARCH), ppc)
-CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
+CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif

 obj-ppc-$(CONFIG_FDT) += device_tree.o
@@ -363,7 +363,7 @@ obj-mips-y += pflash_cfi01.o
 obj-mips-y += vmware_vga.o

 ifeq ($(TARGET_BASE_ARCH), mips)
-CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
+CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif

 obj-microblaze-y = petalogix_s3adsp1800_mmu.o
@@ -424,7 +424,7 @@ obj-arm-y += syborg_serial.o syborg_timer.o 
syborg_pointer.o syborg_rtc.o
 obj-arm-y += syborg_virtio.o

 ifeq ($(TARGET_BASE_ARCH), arm)
-CPPFLAGS += -DHAS_AUDIO
+CFLAGS += -DHAS_AUDIO
 endif

 obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
@@ -441,7 +441,7 @@ COCOA_LIBS+=-framework CoreAudio
 endif
 endif
 ifdef CONFIG_SLIRP
-CPPFLAGS+=-I$(SRC_PATH)/slirp
+CFLAGS+=-I$(SRC_PATH)/slirp
 endif

 # specific flags are needed for non soft mmu emulator
diff --git a/configure b/configure
index 1babbaf..6972cdf 100755
--- a/configure
+++ b/configure
@@ -2114,5 +2114,5 @@ for hwlib in 32 64; do
   rm -f $d/Makefile
   ln -s $source_path/Makefile.hw $d/Makefile
   echo "HWLIB=libqemuhw$hwlib.a" > $d/config.mak
-  echo "CPPFLAGS=-DTARGET_PHYS_ADDR_BITS=$hwlib" >> $d/config.mak
+  echo "CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" >> $d/config.mak
 done
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index ace142d..b9099d7 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -5,9 +5,9 @@ include $(SRC_PATH)/rules.mak

 VPATH=$(SRC_PATH)/pc-bios/optionrom

-CPPFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
-CPPFLAGS += -I$(SRC_PATH)
-CPPFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector,"")
+CFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
+CFLAGS += -I$(SRC_PATH)
+CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector,"")

 build-all: multiboot.bin

diff --git a/rules.mak b/rules.mak
index f9d0ca0..7661e35 100644
--- a/rules.mak
+++ b/rules.mak
@@ -1,12 +1,12 @@

 %.o: %.c
-       $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    
$(TARGET_DIR)$@")
+       $(call quiet-command,$(CC) $(CFLAGS) -c -o $@ $<,"  CC    
$(TARGET_DIR)$@")

 %.o: %.S
-       $(call quiet-command,$(CC) $(CPPFLAGS) -c -o $@ $<,"  AS    
$(TARGET_DIR)$@")
+       $(call quiet-command,$(CC) $(CLAGS) -c -o $@ $<,"  AS    
$(TARGET_DIR)$@")

 %.o: %.m
-       $(call quiet-command,$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<,"  OBJC  
$(TARGET_DIR)$@")
+       $(call quiet-command,$(CC) $(CFLAGS) -c -o $@ $<,"  OBJC  
$(TARGET_DIR)$@")

 LINK = $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(1) $(ARLIBS_BEGIN) 
$(ARLIBS) $(ARLIBS_END) $(LIBS),"  LINK  $(TARGET_DIR)$@")

-- 
1.6.2.5