On Mon, Nov 08, 2010 at 04:52:01PM +0000, Stefan Hajnoczi wrote: > On Mon, Nov 8, 2010 at 11:33 AM, Daniel P. Berrange <d...@berrange.com> wrote: > > diff --git a/Makefile b/Makefile > > index 02698e9..384bf72 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -1,6 +1,10 @@ > > # Makefile for QEMU. > > > > GENERATED_HEADERS = config-host.h trace.h qemu-options.def > > +GENERATED_HEADERS = config-host.h trace.h > > +ifeq ($(TRACE_BACKEND),dtrace) > > +GENERATED_HEADERS += trace-dtrace.h > > +endif > > What happened to qemu-options.def? GENERATED_HEADERS is defined > twice, the first line should probably be deleted.
Oh, the loss of qemu-options.def is a rebase/merge error. GENERATED_HEADERS isn't defined twice, because the second line is using += to append to the first definition. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
