Hi,
>> # Include automatically generated dependency files
>> --include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d
>> qapi/*.d qga/*.d)
>> +-include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d
>> qapi/*.d qga/*.d qom/*.d)
>
> I wonder if, independently of QOM, we also need to consider...
> - qapi-generated/*.d,
> - usb/*.d and
> - tests/*.d?
Maybe we should just stop spreading the dep files over all directories?
RfC patch attached.
cheers,
Gerd
From 7b830d2394b17d8480d0d6dca8de940d591a4a3a Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kra...@redhat.com>
Date: Tue, 29 May 2012 09:03:30 +0200
Subject: [PATCH] dep fixup
Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
Makefile | 10 +++++-----
rules.mak | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 9b7a85e..e872a8a 100644
--- a/Makefile
+++ b/Makefile
@@ -214,12 +214,12 @@ clean:
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h
gen-op-arm.h
rm -f qemu-options.def
- rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.*
*.pod *~ */*~
+ rm -f *.o .*.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.*
*.pod *~ */*~
rm -Rf .libs
- rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o
qga/*.d
- rm -f qom/*.o qom/*.d
+ rm -f slirp/*.o audio/*.o block/*.o net/*.o fsdev/*.o ui/*.o qapi/*.o
qga/*.o
+ rm -f qom/*.o
rm -f qemu-img-cmds.h
- rm -f trace/*.o trace/*.d
+ rm -f trace/*.o
rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
@# May not be present in GENERATED_HEADERS
rm -f trace-dtrace.h trace-dtrace.h-timestamp
@@ -400,4 +400,4 @@ tar:
rm -rf /tmp/$(FILE)
# Include automatically generated dependency files
--include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d qapi/*.d
qga/*.d)
+-include $(wildcard .*.d)
diff --git a/rules.mak b/rules.mak
index efef6f2..9937855 100644
--- a/rules.mak
+++ b/rules.mak
@@ -12,7 +12,7 @@ MAKEFLAGS += -rR
%.mak:
# Flags for dependency generation
-QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
+QEMU_DGFLAGS += -MMD -MP -MT $@ -MF .$(subst /,-,$*).d
%.o: %.c
$(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS)
$(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
--
1.7.1
