| Message ID | 1378877909-28518-2-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
Il 11/09/2013 07:38, Fam Zheng ha scritto: > Makefile.target includes rule.mak and unnested common-obj-y, then prefix > them with '../', this will ignore object specific QEMU_CFLAGS in subdir > Makefile.objs: > > $(obj)/curl.o: QEMU_CFLAGS += $(CURL_CFLAGS) > > Because $(obj) here is './block', instead of '../block'. This doesn't > hurt compiling because we basically build all .o from top Makefile, > before entering Makefile.target, but it will affact arriving per-object > libs support. > > The starting point of $(obj) is passed in as argument of unnest-vars, as > well as nested variables, so that different Makefiles can pass in a > right value. > > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > Makefile | 16 +++++++++++++++- > Makefile.objs | 16 +--------------- > Makefile.target | 16 +++++++++++++--- > configure | 1 + > rules.mak | 12 +++++++----- > tests/Makefile | 2 ++ > 6 files changed, 39 insertions(+), 24 deletions(-) Just two questions... > diff --git a/Makefile.target b/Makefile.target > index 9a49852..1d92523 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -143,13 +143,23 @@ endif # CONFIG_SOFTMMU > # Workaround for http://gcc.gnu.org/PR55489, see configure. > %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS) > > -nested-vars += obj-y > +dummy := $(call unnest-vars,,obj-y) > > -# This resolves all nested paths, so it must come last > +# we are making another call to unnest-vars with different vars, protect obj-y, > +# it can be overriden in subdir Makefile.objs > +obj-y-save := $(obj-y) > + > +block-obj-y := > +common-obj-y := > include $(SRC_PATH)/Makefile.objs > +dummy := $(call unnest-vars,..,block-obj-y common-obj-y) > + > +# Now restore obj-y > +obj-y := $(obj-y-save) > > all-obj-y = $(obj-y) > -all-obj-y += $(addprefix ../, $(common-obj-y)) > +all-obj-y += $(addprefix ../, $(common-obj-y) $(block-obj-y)) Why is addprefix still needed? > > ifndef CONFIG_HAIKU > LIBS+=-lm > diff --git a/configure b/configure > index e989609..cc3cd4d 100755 > --- a/configure > +++ b/configure > @@ -2251,6 +2251,7 @@ fi > if $pkg_config --atleast-version=$glib_req_ver gthread-2.0; then > glib_cflags=`$pkg_config --cflags gthread-2.0` > glib_libs=`$pkg_config --libs gthread-2.0` > + CFLAGS="$glib_cflags $CFLAGS" > LIBS="$glib_libs $LIBS" > libs_qga="$glib_libs $libs_qga" > else > diff --git a/tests/Makefile b/tests/Makefile > index baba9e9..1b4048c 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -110,6 +110,8 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o > $(test-obj-y): QEMU_INCLUDES += -Itests > QEMU_CFLAGS += -I$(SRC_PATH)/tests > > +dummy := $(call unnest-vars,..,block-obj-y) > + And why is this needed, since tests/Makefile is included from the top directory? Paolo > tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386 > > tests/check-qint$(EXESUF): tests/check-qint.o libqemuutil.a >
On Wed, 09/11 08:30, Paolo Bonzini wrote: > Il 11/09/2013 07:38, Fam Zheng ha scritto: > > Makefile.target includes rule.mak and unnested common-obj-y, then prefix > > them with '../', this will ignore object specific QEMU_CFLAGS in subdir > > Makefile.objs: > > > > $(obj)/curl.o: QEMU_CFLAGS += $(CURL_CFLAGS) > > > > Because $(obj) here is './block', instead of '../block'. This doesn't > > hurt compiling because we basically build all .o from top Makefile, > > before entering Makefile.target, but it will affact arriving per-object > > libs support. > > > > The starting point of $(obj) is passed in as argument of unnest-vars, as > > well as nested variables, so that different Makefiles can pass in a > > right value. > > > > Signed-off-by: Fam Zheng <famz@redhat.com> > > --- > > Makefile | 16 +++++++++++++++- > > Makefile.objs | 16 +--------------- > > Makefile.target | 16 +++++++++++++--- > > configure | 1 + > > rules.mak | 12 +++++++----- > > tests/Makefile | 2 ++ > > 6 files changed, 39 insertions(+), 24 deletions(-) > > Just two questions... > > > diff --git a/Makefile.target b/Makefile.target > > index 9a49852..1d92523 100644 > > --- a/Makefile.target > > +++ b/Makefile.target > > @@ -143,13 +143,23 @@ endif # CONFIG_SOFTMMU > > # Workaround for http://gcc.gnu.org/PR55489, see configure. > > %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS) > > > > -nested-vars += obj-y > > +dummy := $(call unnest-vars,,obj-y) > > > > -# This resolves all nested paths, so it must come last > > +# we are making another call to unnest-vars with different vars, protect obj-y, > > +# it can be overriden in subdir Makefile.objs > > +obj-y-save := $(obj-y) > > + > > +block-obj-y := > > +common-obj-y := > > include $(SRC_PATH)/Makefile.objs > > +dummy := $(call unnest-vars,..,block-obj-y common-obj-y) > > + > > +# Now restore obj-y > > +obj-y := $(obj-y-save) > > > > all-obj-y = $(obj-y) > > -all-obj-y += $(addprefix ../, $(common-obj-y)) > > +all-obj-y += $(addprefix ../, $(common-obj-y) $(block-obj-y)) > > Why is addprefix still needed? > OK, should move to unnest-vars as well, it's here because I overlooked the line in your next quesion, which makes that impossible. > > > > ifndef CONFIG_HAIKU > > LIBS+=-lm > > diff --git a/configure b/configure > > index e989609..cc3cd4d 100755 > > --- a/configure > > +++ b/configure > > @@ -2251,6 +2251,7 @@ fi > > if $pkg_config --atleast-version=$glib_req_ver gthread-2.0; then > > glib_cflags=`$pkg_config --cflags gthread-2.0` > > glib_libs=`$pkg_config --libs gthread-2.0` > > + CFLAGS="$glib_cflags $CFLAGS" > > LIBS="$glib_libs $LIBS" > > libs_qga="$glib_libs $libs_qga" > > else > > diff --git a/tests/Makefile b/tests/Makefile > > index baba9e9..1b4048c 100644 > > --- a/tests/Makefile > > +++ b/tests/Makefile > > @@ -110,6 +110,8 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o > > $(test-obj-y): QEMU_INCLUDES += -Itests > > QEMU_CFLAGS += -I$(SRC_PATH)/tests > > > > +dummy := $(call unnest-vars,..,block-obj-y) > > + > > And why is this needed, since tests/Makefile is included from the top > directory? > Legacy. Seems OK to drop. You are really suggesting towards the direction to clean code! Thanks, Fam > > > tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386 > > > > tests/check-qint$(EXESUF): tests/check-qint.o libqemuutil.a > > >
diff --git a/Makefile b/Makefile index 806946e..9e603c6 100644 --- a/Makefile +++ b/Makefile @@ -115,14 +115,28 @@ defconfig: ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs -include $(SRC_PATH)/tests/Makefile endif ifeq ($(CONFIG_SMARTCARD_NSS),y) include $(SRC_PATH)/libcacard/Makefile endif +dummy := $(call unnest-vars,, \ + stub-obj-y \ + util-obj-y \ + qga-obj-y \ + block-obj-y \ + common-obj-y) + +ifneq ($(wildcard config-host.mak),) +include $(SRC_PATH)/tests/Makefile +endif + all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all +vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) + +vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) + config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx diff --git a/Makefile.objs b/Makefile.objs index f46a4cd..4f7a364 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -41,7 +41,7 @@ libcacard-y += libcacard/vcardt.o # single QEMU executable should support all CPUs and machines. ifeq ($(CONFIG_SOFTMMU),y) -common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/ +common-obj-y = blockdev.o blockdev-nbd.o block/ common-obj-y += net/ common-obj-y += readline.o common-obj-y += qdev-monitor.o device-hotplug.o @@ -109,17 +109,3 @@ version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo # FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed # by libqemuutil.a. These should be moved to a separate .json schema. qga-obj-y = qga/ qapi-types.o qapi-visit.o - -vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) - -vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) - -QEMU_CFLAGS+=$(GLIB_CFLAGS) - -nested-vars += \ - stub-obj-y \ - util-obj-y \ - qga-obj-y \ - block-obj-y \ - common-obj-y -dummy := $(call unnest-vars) diff --git a/Makefile.target b/Makefile.target index 9a49852..1d92523 100644 --- a/Makefile.target +++ b/Makefile.target @@ -143,13 +143,23 @@ endif # CONFIG_SOFTMMU # Workaround for http://gcc.gnu.org/PR55489, see configure. %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS) -nested-vars += obj-y +dummy := $(call unnest-vars,,obj-y) -# This resolves all nested paths, so it must come last +# we are making another call to unnest-vars with different vars, protect obj-y, +# it can be overriden in subdir Makefile.objs +obj-y-save := $(obj-y) + +block-obj-y := +common-obj-y := include $(SRC_PATH)/Makefile.objs +dummy := $(call unnest-vars,..,block-obj-y common-obj-y) + +# Now restore obj-y +obj-y := $(obj-y-save) all-obj-y = $(obj-y) -all-obj-y += $(addprefix ../, $(common-obj-y)) +all-obj-y += $(addprefix ../, $(common-obj-y) $(block-obj-y)) + ifndef CONFIG_HAIKU LIBS+=-lm diff --git a/configure b/configure index e989609..cc3cd4d 100755 --- a/configure +++ b/configure @@ -2251,6 +2251,7 @@ fi if $pkg_config --atleast-version=$glib_req_ver gthread-2.0; then glib_cflags=`$pkg_config --cflags gthread-2.0` glib_libs=`$pkg_config --libs gthread-2.0` + CFLAGS="$glib_cflags $CFLAGS" LIBS="$glib_libs $LIBS" libs_qga="$glib_libs $libs_qga" else diff --git a/rules.mak b/rules.mak index 4499745..c08b356 100644 --- a/rules.mak +++ b/rules.mak @@ -103,9 +103,6 @@ clean: clean-timestamp # magic to descend into other directories -obj := . -old-nested-dirs := - define push-var $(eval save-$2-$1 = $(value $1)) $(eval $1 :=) @@ -119,9 +116,11 @@ endef define unnest-dir $(foreach var,$(nested-vars),$(call push-var,$(var),$1/)) -$(eval obj := $(obj)/$1) +$(eval obj-parent-$1 := $(obj)) +$(eval obj := $(if $(obj),$(obj)/$1,$1)) $(eval include $(SRC_PATH)/$1/Makefile.objs) -$(eval obj := $(patsubst %/$1,%,$(obj))) +$(eval obj := $(obj-parent-$1)) +$(eval obj-parent-$1 := ) $(foreach var,$(nested-vars),$(call pop-var,$(var),$1/)) endef @@ -136,6 +135,9 @@ $(if $(nested-dirs), endef define unnest-vars +$(eval obj := $1) +$(eval nested-vars := $2) +$(eval old-nested-dirs := ) $(call unnest-vars-1) $(foreach var,$(nested-vars),$(eval $(var) := $(filter-out %/, $($(var))))) $(shell mkdir -p $(sort $(foreach var,$(nested-vars),$(dir $($(var)))))) diff --git a/tests/Makefile b/tests/Makefile index baba9e9..1b4048c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -110,6 +110,8 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests +dummy := $(call unnest-vars,..,block-obj-y) + tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386 tests/check-qint$(EXESUF): tests/check-qint.o libqemuutil.a
Makefile.target includes rule.mak and unnested common-obj-y, then prefix them with '../', this will ignore object specific QEMU_CFLAGS in subdir Makefile.objs: $(obj)/curl.o: QEMU_CFLAGS += $(CURL_CFLAGS) Because $(obj) here is './block', instead of '../block'. This doesn't hurt compiling because we basically build all .o from top Makefile, before entering Makefile.target, but it will affact arriving per-object libs support. The starting point of $(obj) is passed in as argument of unnest-vars, as well as nested variables, so that different Makefiles can pass in a right value. Signed-off-by: Fam Zheng <famz@redhat.com> --- Makefile | 16 +++++++++++++++- Makefile.objs | 16 +--------------- Makefile.target | 16 +++++++++++++--- configure | 1 + rules.mak | 12 +++++++----- tests/Makefile | 2 ++ 6 files changed, 39 insertions(+), 24 deletions(-)