From patchwork Tue Jun 18 17:34:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 252391 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 873D92C02A5 for ; Wed, 19 Jun 2013 03:34:54 +1000 (EST) Received: from localhost ([::1]:58139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uoznw-0000ns-AL for incoming@patchwork.ozlabs.org; Tue, 18 Jun 2013 13:34:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoznP-0000gL-4G for qemu-devel@nongnu.org; Tue, 18 Jun 2013 13:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoznM-0004gn-AQ for qemu-devel@nongnu.org; Tue, 18 Jun 2013 13:34:19 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:50011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoznL-0004cs-VE for qemu-devel@nongnu.org; Tue, 18 Jun 2013 13:34:16 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 84A2D41A5A; Tue, 18 Jun 2013 21:34:06 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id E19A951B; Tue, 18 Jun 2013 21:34:05 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Tue, 18 Jun 2013 21:34:01 +0400 Message-Id: <1371576844-28743-2-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371576844-28743-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1371576844-28743-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: Michael Tokarev Subject: [Qemu-devel] [RFC PATCH 1/4] build-sys: strip leading ./ from $(obj) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This change modifies the way how subdir objects are handled. Previously, $(obj) make variable were starting with `.' (current directory), and were appended `/subdir' when recursing into subdirs, so that actual objects in top level dir were named ./obj and in subdirs - ./subdir/obj. Remove the `./' suffix and make it plain, so that file names in variables will match those in objects/flags. This allows to have, for example, per-object link flags (to be added in subsequent patches). Signed-off-by: Michael Tokarev --- audio/Makefile.objs | 4 ++-- backends/Makefile.objs | 2 +- block/Makefile.objs | 2 +- hw/audio/Makefile.objs | 2 +- rules.mak | 6 +++--- trace/Makefile.objs | 26 +++++++++++++------------- ui/Makefile.objs | 6 +++--- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/audio/Makefile.objs b/audio/Makefile.objs index d71a877..6ce7409 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -13,5 +13,5 @@ common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o common-obj-y += wavcapture.o -$(obj)/audio.o $(obj)/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) -$(obj)/sdlaudio.o: QEMU_CFLAGS += $(SDL_CFLAGS) +$(obj)audio.o $(obj)fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) +$(obj)sdlaudio.o: QEMU_CFLAGS += $(SDL_CFLAGS) diff --git a/backends/Makefile.objs b/backends/Makefile.objs index 42557d5..5a172d9 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -3,6 +3,6 @@ common-obj-$(CONFIG_POSIX) += rng-random.o common-obj-y += msmouse.o common-obj-$(CONFIG_BRLAPI) += baum.o -$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) +$(obj)baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) common-obj-$(CONFIG_TPM) += tpm.o diff --git a/block/Makefile.objs b/block/Makefile.objs index 2981654..7b7189c 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -22,4 +22,4 @@ common-obj-y += stream.o common-obj-y += commit.o common-obj-y += mirror.o -$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS) +$(obj)curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS) diff --git a/hw/audio/Makefile.objs b/hw/audio/Makefile.objs index 7ce85a2..8dd9827 100644 --- a/hw/audio/Makefile.objs +++ b/hw/audio/Makefile.objs @@ -15,4 +15,4 @@ common-obj-$(CONFIG_CS4231) += cs4231.o common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o -$(obj)/adlib.o $(obj)/fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 +$(obj)adlib.o $(obj)fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 diff --git a/rules.mak b/rules.mak index 4499745..a6bb4f1 100644 --- a/rules.mak +++ b/rules.mak @@ -103,7 +103,7 @@ clean: clean-timestamp # magic to descend into other directories -obj := . +obj := old-nested-dirs := define push-var @@ -119,9 +119,9 @@ endef define unnest-dir $(foreach var,$(nested-vars),$(call push-var,$(var),$1/)) -$(eval obj := $(obj)/$1) +$(eval obj := $(obj)$1/) $(eval include $(SRC_PATH)/$1/Makefile.objs) -$(eval obj := $(patsubst %/$1,%,$(obj))) +$(eval obj := $(patsubst %$1/,%,$(obj))) $(foreach var,$(nested-vars),$(call pop-var,$(var),$1/)) endef diff --git a/trace/Makefile.objs b/trace/Makefile.objs index 3b88e49..5588506 100644 --- a/trace/Makefile.objs +++ b/trace/Makefile.objs @@ -3,16 +3,16 @@ ###################################################################### # Auto-generated event descriptions -$(obj)/generated-events.h: $(obj)/generated-events.h-timestamp -$(obj)/generated-events.h-timestamp: $(SRC_PATH)/trace-events +$(obj)generated-events.h: $(obj)generated-events.h-timestamp +$(obj)generated-events.h-timestamp: $(SRC_PATH)/trace-events $(call quiet-command,$(TRACETOOL) \ --format=events-h \ --backend=events \ < $< > $@," GEN $(patsubst %-timestamp,%,$@)") @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@) -$(obj)/generated-events.c: $(obj)/generated-events.c-timestamp $(BUILD_DIR)/config-host.mak -$(obj)/generated-events.c-timestamp: $(SRC_PATH)/trace-events +$(obj)generated-events.c: $(obj)generated-events.c-timestamp $(BUILD_DIR)/config-host.mak +$(obj)generated-events.c-timestamp: $(SRC_PATH)/trace-events $(call quiet-command,$(TRACETOOL) \ --format=events-c \ --backend=events \ @@ -25,9 +25,9 @@ util-obj-y += generated-events.o ###################################################################### # Auto-generated tracing routines -$(obj)/generated-tracers.h: $(obj)/generated-tracers.h-timestamp +$(obj)generated-tracers.h: $(obj)generated-tracers.h-timestamp @cmp -s $< $@ || cp $< $@ -$(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak +$(obj)generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --format=h \ --backend=$(TRACE_BACKEND) \ @@ -37,15 +37,15 @@ $(obj)/generated-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/conf # Auto-generated tracing routines (non-DTrace) ifneq ($(TRACE_BACKEND),dtrace) -$(obj)/generated-tracers.c: $(obj)/generated-tracers.c-timestamp +$(obj)generated-tracers.c: $(obj)generated-tracers.c-timestamp @cmp -s $< $@ || cp $< $@ -$(obj)/generated-tracers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak +$(obj)generated-tracers.c-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --format=c \ --backend=$(TRACE_BACKEND) \ < $< > $@," GEN $(patsubst %-timestamp,%,$@)") -$(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-tracers.h +$(obj)generated-tracers.o: $(obj)generated-tracers.c $(obj)generated-tracers.h endif @@ -56,18 +56,18 @@ endif # but that gets picked up by QEMU's Makefile as an external dependency # rule file. So we use '.dtrace' instead ifeq ($(TRACE_BACKEND),dtrace) -$(obj)/generated-tracers.dtrace: $(obj)/generated-tracers.dtrace-timestamp -$(obj)/generated-tracers.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak +$(obj)generated-tracers.dtrace: $(obj)generated-tracers.dtrace-timestamp +$(obj)generated-tracers.dtrace-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --format=d \ --backend=$(TRACE_BACKEND) \ < $< > $@," GEN $(patsubst %-timestamp,%,$@)") @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp,%,$@) -$(obj)/generated-tracers-dtrace.h: $(obj)/generated-tracers.dtrace +$(obj)generated-tracers-dtrace.h: $(obj)generated-tracers.dtrace $(call quiet-command,dtrace -o $@ -h -s $<, " GEN $@") -$(obj)/generated-tracers.o: $(obj)/generated-tracers.dtrace +$(obj)generated-tracers.o: $(obj)generated-tracers.dtrace endif ###################################################################### diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 6ddc0de..7265c42 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -15,8 +15,8 @@ common-obj-$(CONFIG_CURSES) += curses.o common-obj-$(CONFIG_VNC) += $(vnc-obj-y) common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o -$(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) +$(obj)sdl.o $(obj)sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) -$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m +$(obj)cocoa.o: $(SRC_PATH)/$(obj)cocoa.m -$(obj)/gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS) +$(obj)gtk.o: QEMU_CFLAGS += $(GTK_CFLAGS) $(VTE_CFLAGS)