Commit 208ecb3e authored by Fam Zheng's avatar Fam Zheng Committed by Alex Bennée
Browse files

Makefile: Rename TARGET_DIRS to TARGET_LIST 



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: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
parent 51a12b51

Makefile

+10 −10
Original line number Diff line number Diff line
@@ -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
@@ -366,8 +366,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:
@@ -470,7 +470,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)
@@ -514,7 +514,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)
@@ -772,7 +772,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
@@ -873,7 +873,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
@@ -1071,9 +1071,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:'

configure

+1 −1
Original line number Diff line number Diff line
@@ -6128,7 +6128,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

scripts/create_config

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -858,7 +858,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))