Patchwork [07/31] Generate config-devices.h

login
register
mail settings
Submitter Juan Quintela
Date Oct. 7, 2009, 12:41 a.m.
Message ID <12bf3dc09b47c3799f6cf61a790eabc98d6f7c16.1254875337.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/35195/
State Accepted
Commit fe0d4d3f7769d5b024e8166fc075148f9cf76ba9
Headers show

Comments

Juan Quintela - Oct. 7, 2009, 12:41 a.m.
Generate config-devices.h for each target and config-all-devices.h for
common library.  We don't want to name both config-devices.h to avoid
path problems

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    7 +++++--
 Makefile.target |    5 ++++-
 config.h        |   10 ++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

Patch

diff --git a/Makefile b/Makefile
index c3df3b2..1f71057 100644
--- a/Makefile
+++ b/Makefile
@@ -40,15 +40,18 @@  config-all-devices.mak: $(SUBDIR_DEVICES_MAK)

 include config-all-devices.mak

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

 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak

+config-all-devices.h: config-all-devices.h-timestamp
+config-all-devices.h-timestamp: config-all-devices.mak
+
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))

-subdir-%: config-host.h
+subdir-%: config-host.h config-all-devices.h
 	$(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 1f2f9bc..191d979 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -30,7 +30,10 @@  kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS)
 config-target.h: config-target.h-timestamp
 config-target.h-timestamp: config-target.mak

-all: config-target.h
+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),)

 # Dummy command so that make thinks it has done something
diff --git a/config.h b/config.h
index 516acee..07d79d4 100644
--- a/config.h
+++ b/config.h
@@ -1,3 +1,13 @@ 

 #include "config-host.h"
 #include "config-target.h"
+
+/* We want to include different config files for specific targets
+   And for the common library.  They need a different name because
+   we don't want to rely in paths */
+
+#if defined(NEED_CPU_H)
+#include "config-devices.h"
+#else
+#include "config-all-devices.h"
+#endif