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 <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 505625e0772aa2e6424874cef97fc41d1f9780b3..95eccac4006d5e963a31da6f69dc39db8b65dde3 100644 (file)
--- 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 53384ac56710db2ebf8bd98b6979bc2860fecb9b..703bb8d8c52b63dd5018a9a8e5b4bdb46d39930f 100644 (file)
--- 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 dc0ebfeb8c5c2e59b47318682792d3346fb061e4..56253277a0a690bcc35ad967379f0547a188d4e1 100644 (file)
--- 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 1dcf9a549253efdfe4a8a40552fd53b0dac36499..7c8bed78795f7ee58f7d0a2860eae8355033885e 100644 (file)
--- 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 fdfaeedbb4080a7820411a58e7d2454642a22ab4..5d7724b3fa2762ce52b141b99862f52d71290fab 100644 (file)
--- 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 dcb5592807ad8c0ecb256d35ddbc26f316210b20..7b75a120d026ad1f4a7cb9b26ab1ea86fdb1d9af 100644 (file)
--- 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 7d9b6e93e0c4401d2ba712648f72c16a76c4fbb2..a2d6b0013d18c4ca304bfc72e66291862b0d164e 100644 (file)
--- 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 4188e50731587b164f4bc1486c08c30abac1038c..5ba4686d85d46cde44612455ba87b1d519f9dd17 100644 (file)
--- 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