From patchwork Tue Apr 24 15:23:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 134119 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2380854lji; Tue, 24 Apr 2018 08:33:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZopL8hA43/9RSUxV/gPdcLBW7XzcLBIv5nB4LqfzxKUIlfZawQ0/XIsQ8E/SIYXfDD2tGUh X-Received: by 2002:ac8:328b:: with SMTP id z11-v6mr14965912qta.287.1524584007360; Tue, 24 Apr 2018 08:33:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524584007; cv=none; d=google.com; s=arc-20160816; b=aZBjXwt1CVgYEs1tl0cMRYb5AArWRR0bSdKQmv7rTtnVM2QRcu5HYG5wBPANRRgcGm RaF+P5Gbqy2BngEe0N3hcMoT6Wa48wvj3Cqb8XqBVr+sSPkWUGtzv+75KgRkrI02PdTX astqL9V8WC0va00BoCxtgmPk1vTZpHbxik6mZdSny0HqZ5U/hSfxMk+ef3ytkod4W8nA gaEEXtf2kDcLijm7OemUzs0HZUtxbpz6i/GRjw0TG6fcVuf2LlCTTvk6QSDXSg4QoQyw 2QDmyu2+7hxpd2bum+dhQsVnUPvL93+diu3WctBOz7JWg0t7AUiUzn9owl0f+l5ThI5Y nDIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=dcXXN8hWUdy4M+oEE1mgM92raCIviDFH4y+rxUINBG0=; b=ObsppdmBs9BjaV7RUnrznEyOLSGdIEKQ4iGh2D2zP7n0Qff8bsmFho6uOEurToHPEM 9Mfd/FmnI310fZueBr2zYMeFDyRfrIzdcmLYJnksl98nflgJ7McvmmZbIlY902EUHykU huXI+BsEMfYUudx8BhWyDrl3j5yeNEfKefOA8T8Xrx7Xxocsb8MuryEvdtCGzRQXax8I pK7wttEKA9/NqGlykFys7KKCSxNm/wPYFXUF7MQd9I7d0/uvzW3sRyfnBHAlHoRAIm1G QBNcFafkteXM0zEV5TiSMUnpkhQ5fY5VlUEcjmbort+NKib77bGKhSB5HT2GVy8HvbWu 5voQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ce8d8zMW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h11-v6si2376179qtp.105.2018.04.24.08.33.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Apr 2018 08:33:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ce8d8zMW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAzwc-0005gI-Mc for patch@linaro.org; Tue, 24 Apr 2018 11:33:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAzno-0006c5-BG for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAznm-0005X1-55 for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:24:20 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35041) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fAznl-0005VR-Nf for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:24:18 -0400 Received: by mail-wr0-x244.google.com with SMTP id w3-v6so50366585wrg.2 for ; Tue, 24 Apr 2018 08:24:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dcXXN8hWUdy4M+oEE1mgM92raCIviDFH4y+rxUINBG0=; b=ce8d8zMWlN+c2g/BDhRIG1qLwfccujtTCmfDKVCV8xN/SIaObB7BsKrp4SMrjhO6a3 H2sRsCefjwyGqUntDEgEENVLcm23W8Q9TJuEI829u3qpLR+xuqHlJmGbWstluy1U0M5q td9D8ZDXOKR+EOfazl/Y8cVV9XloYaZ/Wro6Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dcXXN8hWUdy4M+oEE1mgM92raCIviDFH4y+rxUINBG0=; b=MZgtWpFZqs7MhwdrZ4g7449wn+XD/10u3RcT8A5T4TkaSCGb1NfpJnZnZUIfZVX57E LSk/eIjFk/CxbU2FLPcwGInSHf4qQc0XEIla1gM5hVoLBKd0Os8X5J96tRzC/ShQrdpm zpk7zYOS5ibGN8dWC9uJwdUT5TYuLe29xXcewcLSalzrUFbWOXJh3AVfe+YK+gZR0eDZ Kd0oUiZ4sUsDp4GllCb6oLbfQJQZE95hXlOoBrVAlGIgt72lYylCRq0AT4bEMbnYbDlm zOJkTV1fbkYE0pfqvBBy43y8DcOpUd28ll0oDqx16XTVFIC6P+CJIy6PWq1E1owpaF8E 64UQ== X-Gm-Message-State: ALQs6tCZJ0GuFBFJOXnnZeKVg42G4FeK9jVKS41vEfGz6jVhcGTg4Noq wML+BjxhwSrNGyuIDSNEDpH+Pg== X-Received: by 2002:adf:b979:: with SMTP id b54-v6mr21693145wrg.265.1524583456581; Tue, 24 Apr 2018 08:24:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u8sm7400015wmf.3.2018.04.24.08.24.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 08:24:13 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E63F43E0971; Tue, 24 Apr 2018 16:24:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Tue, 24 Apr 2018 16:23:26 +0100 Message-Id: <20180424152405.10304-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180424152405.10304-1-alex.bennee@linaro.org> References: <20180424152405.10304-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH v3 07/46] Makefile: Rename TARGET_DIRS to TARGET_LIST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng To be more accurate on its purpose and make code that looks for a certain target out of this variable more readable. Signed-off-by: Fam Zheng Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- Makefile | 20 ++++++++++---------- configure | 2 +- scripts/create_config | 2 +- tests/Makefile.include | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) -- 2.17.0 diff --git a/Makefile b/Makefile index d71dd5bea4..e894431a89 100644 --- a/Makefile +++ b/Makefile @@ -62,8 +62,8 @@ seems to have been used for an in-tree build. You can fix this by running \ endif endif -CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) -CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) +CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_LIST)),y) +CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_LIST)),y) CONFIG_XEN := $(CONFIG_XEN_BACKEND) CONFIG_ALL=y -include config-all-devices.mak @@ -362,8 +362,8 @@ DOCS= endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory --quiet) BUILD_DIR=$(BUILD_DIR) -SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) -SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS)) +SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_LIST)) +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_LIST)) ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -466,7 +466,7 @@ config-host.h-timestamp: config-host.mak qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@") -SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) +SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_LIST)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) @@ -510,7 +510,7 @@ ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/" CFLAGS="$(filter -O% -g%,$(CFLAGS))",) -ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) +ALL_SUBDIRS=$(TARGET_LIST) $(patsubst %,pc-bios/%, $(ROMS)) recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) @@ -763,7 +763,7 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -f docs/qemu-block-drivers.7 - for d in $(TARGET_DIRS); do \ + for d in $(TARGET_LIST); do \ rm -rf $$d || exit 1 ; \ done rm -Rf .sdk @@ -864,7 +864,7 @@ endif $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" - for d in $(TARGET_DIRS); do \ + for d in $(TARGET_LIST); do \ $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ done @@ -1062,9 +1062,9 @@ endif @echo ' ctags/TAGS - Generate tags file for editors' @echo ' cscope - Generate cscope index' @echo '' - @$(if $(TARGET_DIRS), \ + @$(if $(TARGET_LIST), \ echo 'Architecture specific targets:'; \ - $(foreach t, $(TARGET_DIRS), \ + $(foreach t, $(TARGET_LIST), \ printf " %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \ echo '') @echo 'Cleaning targets:' diff --git a/configure b/configure index 0100545695..6d99d538cd 100755 --- a/configure +++ b/configure @@ -6125,7 +6125,7 @@ qemu_version=$(head $source_path/VERSION) echo "VERSION=$qemu_version" >>$config_host_mak echo "PKGVERSION=$pkgversion" >>$config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak -echo "TARGET_DIRS=$target_list" >> $config_host_mak +echo "TARGET_LIST=$target_list" >> $config_host_mak if [ "$docs" = "yes" ] ; then echo "BUILD_DOCS=yes" >> $config_host_mak fi diff --git a/scripts/create_config b/scripts/create_config index d727e5e36e..58948a67a4 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -107,7 +107,7 @@ case $line in target_name=${line#*=} echo "#define TARGET_NAME \"$target_name\"" ;; - TARGET_DIRS=*) + TARGET_LIST=*) # do nothing ;; TARGET_*=y) # configuration diff --git a/tests/Makefile.include b/tests/Makefile.include index 3b9a5e31a2..3d2f0458ab 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -854,7 +854,7 @@ endif # QTest rules -TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_LIST))) ifeq ($(CONFIG_POSIX),y) QTEST_TARGETS = $(TARGETS) check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))