Patchwork [1/2] fix parallel build

login
register
mail settings
Submitter Juan Quintela
Date Nov. 5, 2009, 4:19 p.m.
Message ID <f9fc7538e81198671cf1159d082fbe4ddfe335ee.1257437852.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/37783/
State New
Headers show

Comments

Juan Quintela - Nov. 5, 2009, 4:19 p.m.
Based on a ideas of Daniel Jacobowitz + Stefan Weil

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    8 +++++---
 Makefile.target |    6 ++++--
 rules.mak       |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

Patch

diff --git a/Makefile b/Makefile
index c783aa4..4284358 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@ 
 # Makefile for QEMU.

+# This needs to be defined before rules.mak
+GENERATED_HEADERS = config-host.h config-all-devices.h
+
 ifneq ($(wildcard config-host.mak),)
 # Put the all: rule here so that config-host.mak can contain dependencies.
 all: build-all
@@ -40,8 +43,7 @@  config-all-devices.mak: $(SUBDIR_DEVICES_MAK)

 -include config-all-devices.mak

-build-all: config-host.h config-all-devices.h $(DOCS) $(TOOLS)
-	$(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) recurse-all,)
+build-all: $(DOCS) $(TOOLS) recurse-all

 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak
@@ -51,7 +53,7 @@  config-all-devices.h-timestamp: config-all-devices.mak

 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))

-subdir-%: config-host.h config-all-devices.h
+subdir-%: $(GENERATED_HEADERS)
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)

 $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
diff --git a/Makefile.target b/Makefile.target
index fefd7ac..3cd89a1 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,5 +1,8 @@ 
 # -*- Mode: makefile -*-

+# This needs to be defined before rules.mak
+GENERATED_HEADERS = config-target.h config-devices.h
+
 include ../config-host.mak
 include config-devices.mak
 include config-target.mak
@@ -33,8 +36,7 @@  config-target.h-timestamp: config-target.mak
 config-devices.h: config-devices.h-timestamp
 config-devices.h-timestamp: config-devices.mak

-all: config-target.h config-devices.h
-	$(call quiet-command, $(MAKE) $(PROGS),)
+all: $(PROGS)

 # Dummy command so that make thinks it has done something
 	@true
diff --git a/rules.mak b/rules.mak
index 5d7e8bb..4eb1f90 100644
--- a/rules.mak
+++ b/rules.mak
@@ -13,7 +13,7 @@  MAKEFLAGS += -rR

 QEMU_CFLAGS += -MMD -MP -MT $@

-%.o: %.c
+%.o: %.c $(GENERATED_HEADERS)
 	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")

 %.o: %.S