From 3363fc1204a5e9db2bcc4579f86e47956cfce955 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 28 Jul 2014 12:38:18 +0200 Subject: [PATCH] tools: remove duplicate -g from CFLAGS CFLAGS+=-g is already provided by Config.mk. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/vhd/lib/Makefile | 1 - tools/flask/utils/Makefile | 2 +- tools/libxc/Makefile | 2 +- tools/memshr/Makefile | 1 - tools/xenpaging/Makefile | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 1129ca1c8c..37c3485e3b 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -9,7 +9,7 @@ QCOW_UTIL = img2qcow qcow-create qcow2raw LOCK_UTIL = lock-util INST_DIR = $(SBINDIR) -CFLAGS += -Werror -g +CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -fno-strict-aliasing CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index cdbb86cd16..99e3cdbba0 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -17,7 +17,6 @@ CFLAGS += -Wno-unused CFLAGS += -I../../include CFLAGS += -D_GNU_SOURCE CFLAGS += -fPIC -CFLAGS += -g ifeq ($(CONFIG_Linux),y) LIBS := -luuid diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 458f9aad23..dfeb8f7438 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -1,7 +1,7 @@ XEN_ROOT=$(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk -CFLAGS += -Wall -g -Werror +CFLAGS += -Wall -Werror CFLAGS += $(CFLAGS_libxenctrl) TESTDIR = testsuite/tmp diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 22eef8e3b6..3b04027135 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -205,7 +205,7 @@ libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so - $(CC) -g $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) -include $(DEPS) diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile index a2d6b0013d..2c34f968ef 100644 --- a/tools/memshr/Makefile +++ b/tools/memshr/Makefile @@ -9,7 +9,6 @@ CFLAGS += $(CFLAGS_xeninclude) CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += -D_GNU_SOURCE CFLAGS += -fPIC -CFLAGS += -g LIB-SRCS := interface.c LIB-SRCS += shm.c diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 548d9ddaf6..4ff3375e0c 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -13,7 +13,6 @@ SRCS += pagein.c CFLAGS += -Werror CFLAGS += -Wno-unused -CFLAGS += -g OBJS = $(SRCS:.c=.o) IBINS = xenpaging -- 2.30.2