diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-21 09:23:18 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-12 17:19:09 +0100 |
commit | 2c13ec50e763621889f2b2e6b5d587f692e58f3f (patch) | |
tree | e721838c64d54f1c3b2f61f36386879ce95ee512 | |
parent | 2165588274332e9f08891d5b22d56f4c0b7dc437 (diff) |
build: move dtrace rules to rules.mak
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | rules.mak | 9 | ||||
-rw-r--r-- | trace/Makefile.objs | 12 |
2 files changed, 9 insertions, 12 deletions
@@ -23,6 +23,9 @@ QEMU_CFLAGS += -I$(<D) -I$(@D) ifeq ($(LIBTOOL),) %.lo: %.c @echo "missing libtool. please install and rerun configure"; exit 1 +%.lo: %.dtrace + @echo "missing libtool. please install and rerun configure."; exit 1 + LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ $(sort $(filter %.o, $1)) $(filter-out %.o, $1) \ $(LIBS)," LINK $(TARGET_DIR)$@") @@ -30,6 +33,9 @@ else LIBTOOL += $(if $(V),,--quiet) %.lo: %.c $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@") +%.lo: %.dtrace + $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN $(TARGET_DIR)$@") + LINK = $(call quiet-command,\ $(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \ )$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ @@ -46,6 +52,9 @@ endif %.o: %.m $(call quiet-command,$(OBJCC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@") +%.o: %.dtrace + $(call quiet-command,dtrace -o $@ -G -s $<, " GEN $(TARGET_DIR)$@") + %$(EXESUF): %.o $(call LINK,$^) diff --git a/trace/Makefile.objs b/trace/Makefile.objs index b791723696..40febce5a1 100644 --- a/trace/Makefile.objs +++ b/trace/Makefile.objs @@ -46,21 +46,9 @@ $(obj)/generated-tracers-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUI $(obj)/generated-tracers-dtrace.h: trace/generated-tracers-dtrace.dtrace $(call quiet-command,dtrace -o $@ -h -s $<, " GEN $@") -$(obj)/generated-tracers-dtrace.o: trace/generated-tracers-dtrace.dtrace - $(call quiet-command,dtrace -o $@ -G -s $<, " GEN $@") - trace-obj-$(CONFIG_TRACE_DTRACE) += generated-tracers-dtrace.o -ifeq ($(LIBTOOL),) -$(obj)/generated-tracers-dtrace.lo: $(obj)/generated-tracers-dtrace.dtrace - @echo "missing libtool. please install and rerun configure."; exit 1 -else -$(obj)/generated-tracers-dtrace.lo: $(obj)/generated-tracers-dtrace.dtrace - $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G -s $<, " lt GEN $@") -endif - - ###################################################################### # Backend code |