[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 1/7] Makefile: Rename TARGET_DIRS to TARGET_LIST
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH RFC 1/7] Makefile: Rename TARGET_DIRS to TARGET_LIST |
Date: |
Fri, 8 Sep 2017 17:16:54 +0800 |
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 <address@hidden>
---
Makefile | 20 ++++++++++----------
configure | 2 +-
scripts/create_config | 2 +-
tests/Makefile.include | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 337a1f6f9b..c1e35b1fd0 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,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
@@ -217,8 +217,8 @@ DOCS=
endif
SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) 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:
@@ -314,7 +314,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)
@@ -352,7 +352,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)
@@ -537,7 +537,7 @@ distclean: clean
rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt
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
- for d in $(TARGET_DIRS); do \
+ for d in $(TARGET_LIST); do \
rm -rf $$d || exit 1 ; \
done
rm -Rf .sdk
@@ -638,7 +638,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
@@ -832,9 +832,9 @@ help:
@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 a541aadebc..36a2fa1f23 100755
--- a/configure
+++ b/configure
@@ -5587,7 +5587,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 e6929dd61e..3612f8154f 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 fae5715e9c..debaf845db 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -820,7 +820,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))
--
2.13.5
- [Qemu-devel] [PATCH RFC 0/7] Proof of concept to power up "make test" with docker, Fam Zheng, 2017/09/08
- [Qemu-devel] [PATCH RFC 1/7] Makefile: Rename TARGET_DIRS to TARGET_LIST,
Fam Zheng <=
- [Qemu-devel] [PATCH RFC 2/7] docker: Add "cc" subcommand, Fam Zheng, 2017/09/08
- [Qemu-devel] [PATCH RFC 3/7] docker: Add fedora-i386-cross image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PATCH RFC 4/7] tests: Build fix for hello-i386, Fam Zheng, 2017/09/08
- [Qemu-devel] [PATCH RFC 5/7] tests: Build fix for linux-test, Fam Zheng, 2017/09/08
- [Qemu-devel] [PATCH RFC 6/7] buildsys: Add "check-tcg" target, Fam Zheng, 2017/09/08
- [Qemu-devel] [PATCH RFC 7/7] tests: Move i386 tcg tests to check-tcg, Fam Zheng, 2017/09/08
- Re: [Qemu-devel] [PATCH RFC 0/7] Proof of concept to power up "make test" with docker, no-reply, 2017/09/08