# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 7e68bc2745afdeb7e948b2365c01f53e00d89e46
# Parent fbeb0a5b7219630839986cf4cdb1b813618cbdce
Clean up the usage of CFLAGS. This is nice for packagers, who would
like to control the base compilation flags from a central place.
Signed-off-by: Charles Coffing <ccoffing@xxxxxxxxxx>
diff -r fbeb0a5b7219 -r 7e68bc2745af Config.mk
--- a/Config.mk Thu Mar 9 16:24:57 2006
+++ b/Config.mk Thu Mar 9 20:17:45 2006
@@ -40,6 +40,8 @@
test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2))
+CFLAGS += -Wall
+
HOSTCFLAGS += $(call test-gcc-flag,$(HOSTCC),-Wdeclaration-after-statement)
CFLAGS += $(call test-gcc-flag,$(CC),-Wdeclaration-after-statement)
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/blktap/Makefile
--- a/tools/blktap/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/blktap/Makefile Thu Mar 9 20:17:45 2006
@@ -22,7 +22,6 @@
SRCS :=
SRCS += blktaplib.c xenbus.c blkif.c
-CFLAGS += -Wall
CFLAGS += -Werror
CFLAGS += -Wno-unused
#CFLAGS += -O3
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/blktap/parallax/Makefile
--- a/tools/blktap/parallax/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/blktap/parallax/Makefile Thu Mar 9 20:17:45 2006
@@ -31,7 +31,6 @@
VDI_TOOLS += vdi_tree
VDI_TOOLS += vdi_validate
-CFLAGS += -Wall
CFLAGS += -Werror
CFLAGS += -Wno-unused
#CFLAGS += -O3
@@ -58,7 +57,7 @@
$(CC) $(CFLAGS) -o parallax -L.. $(LDFLAGS) $(PLX_SRCS)
${VDI_TOOLS}: %: %.c $(VDI_SRCS)
- $(CC) $(CFLAGS) -g3 -o $@ $@.c $(LDFLAGS) $(VDI_SRCS)
+ $(CC) $(CFLAGS) -o $@ $@.c $(LDFLAGS) $(VDI_SRCS)
.PHONY: TAGS clean install rpm
--include $(DEPS)
\ No newline at end of file
+-include $(DEPS)
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/blktap/ublkback/Makefile
--- a/tools/blktap/ublkback/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/blktap/ublkback/Makefile Thu Mar 9 20:17:45 2006
@@ -9,7 +9,6 @@
IBIN = ublkback
INSTALL_DIR = /usr/sbin
-CFLAGS += -Wall
CFLAGS += -Werror
CFLAGS += -Wno-unused
#CFLAGS += -O3
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/console/Makefile
--- a/tools/console/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/console/Makefile Thu Mar 9 20:17:45 2006
@@ -9,7 +9,7 @@
INSTALL_PROG = $(INSTALL) -m0755
INSTALL_DIR = $(INSTALL) -d -m0755
-CFLAGS += -Wall -Werror -g3
+CFLAGS += -Werror -g
CFLAGS += -I $(XEN_LIBXC)
CFLAGS += -I $(XEN_XENSTORE)
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/debugger/libxendebug/Makefile
--- a/tools/debugger/libxendebug/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/debugger/libxendebug/Makefile Thu Mar 9 20:17:45 2006
@@ -14,7 +14,7 @@
SRCS := xendebug.c
-CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
+CFLAGS += -Werror -O3 -fno-strict-aliasing
CFLAGS += $(INCLUDES) -I. -I$(XEN_ROOT)/tools/libxc
# Get gcc to generate the dependencies for us.
CFLAGS += -Wp,-MD,.$(@F).d
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/debugger/pdb/Makefile
--- a/tools/debugger/pdb/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/debugger/pdb/Makefile Thu Mar 9 20:17:45 2006
@@ -20,7 +20,6 @@
INCLUDES += -I $(OCAML_ROOT)/lib/ocaml
CFLAGS += $(INCLUDES)
-CFLAGS += -Wall
CFLAGS += -Werror
CFLAGS += -g
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/ioemu/Makefile
--- a/tools/ioemu/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/ioemu/Makefile Thu Mar 9 20:17:45 2006
@@ -3,7 +3,7 @@
-include config-host.mak
-CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS+=-O2 -g -fno-strict-aliasing
ifdef CONFIG_DARWIN
CFLAGS+= -mdynamic-no-pic
endif
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/ioemu/target-i386-dm/Makefile
--- a/tools/ioemu/target-i386-dm/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/ioemu/target-i386-dm/Makefile Thu Mar 9 20:17:45 2006
@@ -13,7 +13,7 @@
VPATH+=:$(SRC_PATH)/linux-user
DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
endif
-CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS+=-O2 -g -fno-strict-aliasing
LDFLAGS=-g
LIBS=
HELPER_CFLAGS=$(CFLAGS)
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/libxc/Makefile
--- a/tools/libxc/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/libxc/Makefile Thu Mar 9 20:17:45 2006
@@ -48,7 +48,6 @@
BUILD_SRCS += xc_hvm_build.c
endif
-CFLAGS += -Wall
CFLAGS += -Werror
CFLAGS += -O3
CFLAGS += -fno-strict-aliasing
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/misc/Makefile
--- a/tools/misc/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/misc/Makefile Thu Mar 9 20:17:45 2006
@@ -5,7 +5,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Wall -Werror -O3
+CFLAGS += -Werror -O3
INCLUDES += -I $(XEN_XC)
INCLUDES += -I $(XEN_LIBXC)
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/misc/cpuperf/Makefile
--- a/tools/misc/cpuperf/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/misc/cpuperf/Makefile Thu Mar 9 20:17:45 2006
@@ -17,7 +17,7 @@
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Wall -O3
+CFLAGS += -O3
HDRS = $(wildcard *.h)
SRCS = $(wildcard *.c)
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/misc/lomount/Makefile
--- a/tools/misc/lomount/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/misc/lomount/Makefile Thu Mar 9 20:17:45 2006
@@ -6,7 +6,7 @@
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Wall -Werror -O3
+CFLAGS += -Werror -O3
HDRS = $(wildcard *.h)
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/misc/mbootpack/Makefile
--- a/tools/misc/mbootpack/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/misc/mbootpack/Makefile Thu Mar 9 20:17:45 2006
@@ -20,7 +20,7 @@
INCS := -I. -I-
DEFS :=
LDFLAGS :=
-CFLAGS := -Wall -Wpointer-arith -Wcast-qual -Wno-unused -Wno-format
+CFLAGS += -Wpointer-arith -Wcast-qual -Wno-unused -Wno-format
CFLAGS += -Wmissing-prototypes
#CFLAGS += -pipe -g -O0 -Wcast-align
CFLAGS += -pipe -O3
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/misc/miniterm/Makefile
--- a/tools/misc/miniterm/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/misc/miniterm/Makefile Thu Mar 9 20:17:45 2006
@@ -1,9 +1,10 @@
+XEN_ROOT:=../../..
+include $(XEN_ROOT)/tools/Rules.mk
+
INSTALL = install
INSTALL_PROG = $(INSTALL) -m0755
INSTALL_DIR = $(INSTALL) -d -m0755
-CC = gcc
-CFLAGS = -Wall -O3
TARGET = miniterm
all: $(TARGET)
@@ -16,4 +17,4 @@
$(RM) *.o $(TARGET) *~
$(TARGET): $(TARGET).c
- $(CC) $(CFLAGS) -o $@ $<
+ $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/misc/nsplitd/Makefile
--- a/tools/misc/nsplitd/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/misc/nsplitd/Makefile Thu Mar 9 20:17:45 2006
@@ -1,6 +1,6 @@
+XEN_ROOT := ../../..
+include $(XEN_ROOT)/tools/Rules.mk
-CC = gcc
-CFLAGS = -Wall -O3
CFILES = $(wildcard *.c)
HDRS = $(wildcard *.h)
@@ -16,7 +16,7 @@
$(RM) *.o $(TARGET) *~
$(TARGET): $(OBJS)
- $(CC) $(CFLAGS) -o $@ $^
+ $(HOSTCC) $(HOSTCFLAGS) -o $@ $^
%.o: %.c $(HDRS) Makefile
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/security/Makefile
--- a/tools/security/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/security/Makefile Thu Mar 9 20:17:45 2006
@@ -1,7 +1,6 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Wall
CFLAGS += -Werror
CFLAGS += -O3
CFLAGS += -fno-strict-aliasing
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/vnet/libxutil/Makefile
--- a/tools/vnet/libxutil/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/vnet/libxutil/Makefile Thu Mar 9 20:17:45 2006
@@ -29,8 +29,7 @@
LIB_OBJS := $(LIB_SRCS:.c=.o)
PIC_OBJS := $(LIB_SRCS:.c=.opic)
-CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
-CFLAGS += -g
+CFLAGS += -Werror -O3 -fno-strict-aliasing -g
# Get gcc to generate the dependencies for us.
CFLAGS += -Wp,-MD,.$(@F).d
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/vnet/vnetd/Makefile
--- a/tools/vnet/vnetd/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/vnet/vnetd/Makefile Thu Mar 9 20:17:45 2006
@@ -44,7 +44,6 @@
#----------------------------------------------------------------------------
CFLAGS += -g
CFLAGS += -O2
-CFLAGS += -Wall
CFLAGS += $(INCLUDES) $(LIBS)
LDFLAGS += $(LIBS)
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/vtpm/Rules.mk
--- a/tools/vtpm/Rules.mk Thu Mar 9 16:24:57 2006
+++ b/tools/vtpm/Rules.mk Thu Mar 9 20:17:45 2006
@@ -14,7 +14,7 @@
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
# General compiler flags
-CFLAGS = -Wall -Werror -g3 -I.
+CFLAGS = -Werror -g3 -I.
# For generating dependencies
CFLAGS += -Wp,-MD,.$(@F).d
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/vtpm_manager/Rules.mk
--- a/tools/vtpm_manager/Rules.mk Thu Mar 9 16:24:57 2006
+++ b/tools/vtpm_manager/Rules.mk Thu Mar 9 20:17:45 2006
@@ -14,7 +14,7 @@
TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin
# General compiler flags
-CFLAGS = -Wall -Werror -g3 -I.
+CFLAGS = -Werror -g3 -I.
# For generating dependencies
CFLAGS += -Wp,-MD,.$(@F).d
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/xcutils/Makefile
--- a/tools/xcutils/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/xcutils/Makefile Thu Mar 9 20:17:45 2006
@@ -19,7 +19,7 @@
INCLUDES += -I $(XEN_LIBXC)
-CFLAGS += -Wall -Werror -O3 -fno-strict-aliasing
+CFLAGS += -Werror -O3 -fno-strict-aliasing
CFLAGS += $(INCLUDES)
# Make gcc generate dependencies.
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/xenmon/Makefile
--- a/tools/xenmon/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/xenmon/Makefile Thu Mar 9 20:17:45 2006
@@ -20,7 +20,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Wall -Werror -g
+CFLAGS += -Werror -g
CFLAGS += -I $(XEN_XC)
CFLAGS += -I $(XEN_LIBXC)
LDFLAGS += -L $(XEN_LIBXC)
diff -r fbeb0a5b7219 -r 7e68bc2745af tools/xentrace/Makefile
--- a/tools/xentrace/Makefile Thu Mar 9 16:24:57 2006
+++ b/tools/xentrace/Makefile Thu Mar 9 20:17:45 2006
@@ -6,7 +6,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Wall -Werror -O3
+CFLAGS += -Werror -O3
CFLAGS += -I $(XEN_XC)
CFLAGS += -I $(XEN_LIBXC)
diff -r fbeb0a5b7219 -r 7e68bc2745af xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk Thu Mar 9 16:24:57 2006
+++ b/xen/arch/x86/Rules.mk Thu Mar 9 20:17:45 2006
@@ -9,7 +9,7 @@
supervisor_mode_kernel ?= n
CFLAGS += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
-CFLAGS += -iwithprefix include -Wall -Werror -Wno-pointer-arith -pipe
+CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
CFLAGS += -I$(BASEDIR)/include
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|