diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2010-11-16 20:07:07 +0000 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-11-16 14:35:00 -0600 |
| commit | b88417062d5f73e2e8137e94b360ca4412942f33 (patch) | |
| tree | 29a9b8b198ac83a28ade7de473355ac6979b2761 /Makefile.target | |
| parent | 0290b57bdfec83ca78b6d119ea9847bb17943328 (diff) | |
| download | qemu-b88417062d5f73e2e8137e94b360ca4412942f33.tar.gz qemu-b88417062d5f73e2e8137e94b360ca4412942f33.tar.bz2 qemu-b88417062d5f73e2e8137e94b360ca4412942f33.zip | |
Fix compilation failure with simple trace when srcdir==objdir
Fix a makefile error that meant that qemu would not compile if
the source and object directories were the same.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.target b/Makefile.target index a5e6410cec..652c7d2a57 100644 --- a/Makefile.target +++ b/Makefile.target @@ -30,6 +30,7 @@ endif endif PROGS=$(QEMU_PROG) +STPFILES= ifndef CONFIG_HAIKU LIBS+=-lm @@ -41,19 +42,17 @@ config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak ifdef CONFIG_SYSTEMTAP_TRACE -trace: $(QEMU_PROG).stp +STPFILES+=$(QEMU_PROG).stp $(QEMU_PROG).stp: $(call quiet-command,sh $(SRC_PATH)/tracetool \ --$(TRACE_BACKEND) \ --bindir $(bindir) \ --target $(TARGET_ARCH) \ - -s < $(SRC_PATH)/trace-events > $(QEMU_PROG).stp," GEN $(QEMU_PROG).stp") -else -trace: + -s < $(SRC_PATH)/trace-events > $@," GEN $@") endif -all: $(PROGS) trace +all: $(PROGS) $(STPFILES) # Dummy command so that make thinks it has done something @true @@ -363,7 +362,7 @@ endif endif ifdef CONFIG_SYSTEMTAP_TRACE $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset" - $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset" + $(INSTALL_DATA) $(STPFILES) "$(DESTDIR)$(datadir)/../systemtap/tapset" endif # Include automatically generated dependency files |