[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/27] build: move dtrace rules to rules.mak
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/27] build: move dtrace rules to rules.mak |
Date: |
Fri, 21 Dec 2012 17:05:26 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 8 --------
rules.mak | 9 +++++++++
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 346bf9d..7858c4e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -169,14 +169,6 @@ trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events
$(BUILD_DIR)/config-host
trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS)
$(call quiet-command,dtrace -o $@ -G -s $<, " GEN trace-dtrace.o")
-ifeq ($(LIBTOOL),)
-trace-dtrace.lo: trace-dtrace.dtrace
- @echo "missing libtool. please install and rerun configure."; exit 1
-else
-trace-dtrace.lo: trace-dtrace.dtrace
- $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G
-s $<, " lt GEN trace-dtrace.o")
-endif
-
trace/simple.o: trace/simple.c $(GENERATED_HEADERS)
trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/rules.mak b/rules.mak
index 6a7af8a..494fff8 100644
--- a/rules.mak
+++ b/rules.mak
@@ -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 $@ \
@@ -43,6 +49,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,$^)
--
1.7.1
- [Qemu-devel] [PATCH 00/27] More source reorganization and build system TLC, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 01/27] qemu-option: move standard option definitions out of qemu-config.c, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 03/27] build: make libtool verbose when making with V=1, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 05/27] build: move dtrace rules to rules.mak,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 04/27] build: support linking with libtool objects/libraries, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 02/27] stubs: fully replace qemu-tool.c and qemu-user.c, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 07/27] libcacard: fix missing symbol in libcacard.so, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 06/27] build: remove CONFIG_SMARTCARD, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 08/27] libcacard: require libtool to build it, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 09/27] libcacard: prepare to use -y trick in the Makefile, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 11/27] libcacard: add list of exported symbols, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 10/27] libcacard: use per-target variable definitions, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 13/27] libcacard: link vscclient to dynamic library, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 14/27] libcacard: list oslib-obj-y file explicitly, Paolo Bonzini, 2012/12/21