[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v20 03/11] rules.mak: allow per object cflags and li
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v20 03/11] rules.mak: allow per object cflags and libs |
Date: |
Mon, 10 Feb 2014 14:48:53 +0800 |
Adds extract-libs in LINK to expand any "per object libs", the syntax to define
such a libs options is like:
foo.o-libs := $(CURL_LIBS)
in block/Makefile.objs.
Similarly,
foo.o-cflags := $(FOO_CFLAGS)
is also supported.
"foo.o" must be listed in a nested var (e.g. common-obj-y) to make the
option variables effective.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
rules.mak | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/rules.mak b/rules.mak
index 7d27602..9398268 100644
--- a/rules.mak
+++ b/rules.mak
@@ -21,15 +21,17 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
# Same as -I$(SRC_PATH) -I., but for the nested source/object directories
QEMU_INCLUDES += -I$(<D) -I$(@D)
+extract-libs = $(strip $(foreach o,$1,$($o-libs)))
+
%.o: %.c
- $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS)
$(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
+ $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS)
$(QEMU_DGFLAGS) $(CFLAGS) $(address@hidden) -c -o $@ $<," CC
$(TARGET_DIR)$@")
%.o: %.rc
$(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@")
ifeq ($(LIBTOOL),)
LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
$(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
- $(LIBS)," LINK $(TARGET_DIR)$@")
+ $(call extract-libs,$^) $(LIBS)," LINK $(TARGET_DIR)$@")
else
LIBTOOL += $(if $(V),,--quiet)
%.lo: %.c
@@ -45,7 +47,7 @@ LINK = $(call quiet-command,\
$(sort $(filter %.o, $1)) $(filter-out %.o, $1) \
$(if $(filter %.lo %.la,$^),$(version-lobj-y),$(version-obj-y)) \
$(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
- $(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK
")"$(TARGET_DIR)$@")
+ $(call extract-libs,$^) $(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ",
" LINK ")"$(TARGET_DIR)$@")
endif
%.asm: %.S
@@ -149,11 +151,22 @@ $(eval $1 = $(value save-$2-$1) $$(subdir-$2-$1))
$(eval save-$2-$1 :=)
endef
+define fix-obj-vars
+$(foreach v,$($1), \
+ $(if $($v-cflags), \
+ $(eval $2$v-cflags := $($v-cflags)) \
+ $(eval $v-cflags := )) \
+ $(if $($v-libs), \
+ $(eval $2$v-libs := $($v-libs)) \
+ $(eval $v-libs := )))
+endef
+
define unnest-dir
$(foreach var,$(nested-vars),$(call push-var,$(var),$1/))
$(eval obj-parent-$1 := $(obj))
$(eval obj := $(if $(obj),$(obj)/$1,$1))
$(eval include $(SRC_PATH)/$1/Makefile.objs)
+$(foreach v,$(nested-vars),$(call fix-obj-vars,$v,$(if $(obj),$(obj)/)))
$(eval obj := $(obj-parent-$1))
$(eval obj-parent-$1 := )
$(foreach var,$(nested-vars),$(call pop-var,$(var),$1/))
--
1.8.5.4
- [Qemu-devel] [PATCH v20 00/11] Shared library module support, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 02/11] rules.mak: fix $(obj) to a real relative path, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 01/11] util: Split out exec_dir from os_find_datadir, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 03/11] rules.mak: allow per object cflags and libs,
Fam Zheng <=
- [Qemu-devel] [PATCH v20 04/11] block: use per-object cflags and libs, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 05/11] darwin: do not use -mdynamic-no-pic, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 06/11] rules.mak: introduce DSO rules, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 08/11] Makefile: install modules with "make install", Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 07/11] module: implement module loading, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 09/11] Makefile: introduce common-obj-m and block-obj-m for DSO, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 10/11] block: convert block drivers linked with libs to modules, Fam Zheng, 2014/02/10
- [Qemu-devel] [PATCH v20 11/11] oslib: port qemu_init_exec_dir to Darwin, Fam Zheng, 2014/02/10
- Re: [Qemu-devel] [PATCH v20 00/11] Shared library module support, Fam Zheng, 2014/02/17