| Message ID | 20120306185038.16122.2427.stgit@ginnungagap.bsc.es |
|---|---|
| State | New |
| Headers | show |
2012/3/6 Lluís Vilanova <vilanova@ac.upc.edu>: > Current code depends on variables defined in config-host.mak before it is > actually included. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> -- PMM
Thanks, applied. On Tue, Mar 6, 2012 at 18:50, Lluís Vilanova <vilanova@ac.upc.edu> wrote: > Current code depends on variables defined in config-host.mak before it is > actually included. > > Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> > Cc: Anthony Liguori <aliguori@us.ibm.com> > Cc: Paul Brook <paul@codesourcery.com> > --- > 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: ; > >
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: ;
Current code depends on variables defined in config-host.mak before it is actually included. Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> Cc: Anthony Liguori <aliguori@us.ibm.com> Cc: Paul Brook <paul@codesourcery.com> --- Makefile | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)