[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] build: Include config-host.mak as soon as possible
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH] build: Include config-host.mak as soon as possible |
Date: |
Tue, 06 Mar 2012 19:50:38 +0100 |
User-agent: |
StGit/0.16 |
Current code depends on variables defined in config-host.mak before it is
actually included.
Signed-off-by: Lluís Vilanova <address@hidden>
Cc: Anthony Liguori <address@hidden>
Cc: Paul Brook <address@hidden>
---
Makefile | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 49c775b..408065e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,7 @@
# Always point to the root of the build tree (needs GNU make).
BUILD_DIR=$(CURDIR)
-GENERATED_HEADERS = config-host.h trace.h qemu-options.def
-ifeq ($(TRACE_BACKEND),dtrace)
-GENERATED_HEADERS += trace-dtrace.h
-endif
-GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
-GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
-
+# All following code might depend on configuration variables
ifneq ($(wildcard config-host.mak),)
# Put the all: rule here so that config-host.mak can contain dependencies.
all: build-all
@@ -24,6 +18,13 @@ config-host.mak:
@exit 1
endif
+GENERATED_HEADERS = config-host.h trace.h qemu-options.def
+ifeq ($(TRACE_BACKEND),dtrace)
+GENERATED_HEADERS += trace-dtrace.h
+endif
+GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
+GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
+
# Don't try to regenerate Makefile or configure
# We don't generate any of them
Makefile: ;
- [Qemu-devel] [PATCH] build: Include config-host.mak as soon as possible,
Lluís Vilanova <=