From 5ba627e3ab07793506dd71bac2ae377e3cdd74be Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 23 Mar 2011 15:56:46 +0000 Subject: [PATCH] tools: drop further uses of -Wp,-MD,.$(@F).d to generate dependencies. 19025:bd78714b8594 switched to "-MMD -MF" in preference, adding the correct runes to tools/Rules.mk but appears to have missed some other uses of -Wp,... Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/blktap/lib/Makefile | 4 ---- tools/blktap2/control/Makefile | 4 ---- tools/blktap2/lvm/Makefile | 4 ---- tools/blktap2/vhd/Makefile | 4 ---- tools/blktap2/vhd/lib/Makefile | 4 ---- tools/flask/libflask/Makefile | 3 --- tools/memshr/Makefile | 4 ---- tools/xenpaging/Makefile | 3 --- 8 files changed, 30 deletions(-) diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile index 505625e077..95eccac400 100644 --- a/tools/blktap/lib/Makefile +++ b/tools/blktap/lib/Makefile @@ -19,10 +19,6 @@ CFLAGS += -fPIC # get asprintf(): CFLAGS += -D _GNU_SOURCE -# Get gcc to generate the dependencies for us. -CFLAGS += -Wp,-MD,.$(@F).d -DEPS = .*.d - OBJS = $(SRCS:.c=.o) OBJS_PIC = $(SRCS:.c=.opic) IBINS := diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 53384ac567..703bb8d8c5 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -16,10 +16,6 @@ CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += -D_GNU_SOURCE CFLAGS += -DTAPCTL -# Get gcc to generate the dependencies for us. -CFLAGS += -Wp,-MD,.$(@F).d -DEPS = .*.d - CTL_OBJS := tap-ctl-ipc.o CTL_OBJS += tap-ctl-list.o CTL_OBJS += tap-ctl-allocate.o diff --git a/tools/blktap2/lvm/Makefile b/tools/blktap2/lvm/Makefile index dc0ebfeb8c..56253277a0 100644 --- a/tools/blktap2/lvm/Makefile +++ b/tools/blktap2/lvm/Makefile @@ -15,10 +15,6 @@ ifeq ($(CONFIG_X86_64),y) CFLAGS += -fPIC endif -# Get gcc to generate the dependencies for us. -CFLAGS += -Wp,-MD,.$(@F).d -DEPS = .*.d - LVM-OBJS := lvm-util.o all: build diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index 1dcf9a5492..7c8bed7879 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -23,10 +23,6 @@ endif LIBS := -Llib -lvhd -# Get gcc to generate the dependencies for us. -CFLAGS += -Wp,-MD,.$(@F).d -DEPS = .*.d - all: subdirs-all build build: $(IBIN) diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index fdfaeedbb4..5d7724b3fa 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -23,10 +23,6 @@ ifeq ($(CONFIG_Linux),y) LIBS := -luuid endif -# Get gcc to generate the dependencies for us. -CFLAGS += -Wp,-MD,.$(@F).d -DEPS = .*.d - LIB-SRCS := libvhd.c LIB-SRCS += libvhd-journal.c LIB-SRCS += vhd-util-coalesce.c diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile index dcb5592807..7b75a120d0 100644 --- a/tools/flask/libflask/Makefile +++ b/tools/flask/libflask/Makefile @@ -11,9 +11,6 @@ CFLAGS += -Werror CFLAGS += -fno-strict-aliasing CFLAGS += -I./include $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) -# Get gcc to generate the dependencies for us. -CFLAGS += -Wp,-MD,.$(@F).d - LIB_OBJS := $(patsubst %.c,%.o,$(SRCS)) PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS)) diff --git a/tools/memshr/Makefile b/tools/memshr/Makefile index 7d9b6e93e0..a2d6b0013d 100644 --- a/tools/memshr/Makefile +++ b/tools/memshr/Makefile @@ -11,10 +11,6 @@ CFLAGS += -D_GNU_SOURCE CFLAGS += -fPIC CFLAGS += -g -# Get gcc to generate the dependencies for us. -CFLAGS += -Wp,-MD,.$(@F).d -DEPS = .*.d - LIB-SRCS := interface.c LIB-SRCS += shm.c LIB-SRCS += bidir-daemon.c diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 4188e50731..5ba4686d85 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -13,9 +13,6 @@ CFLAGS += -Werror CFLAGS += -Wno-unused CFLAGS += -g -CFLAGS += -Wp,-MD,.$(@F).d -DEPS = .*.d - OBJS = $(SRCS:.c=.o) IBINS = xenpaging -- 2.39.5