From 68f2bdc641689e1d411ecceb1c557d30ef693ee3 Mon Sep 17 00:00:00 2001
From: Nguyen Anh Quynh <aquynh@gmail.com>
Date: Mon, 8 Jun 2020 10:06:34 +0800
Subject: [PATCH] more cleanup for Makefile

---
 .gitignore           |  2 --
 qemu/Makefile        | 23 -----------------------
 qemu/Makefile.target |  1 -
 3 files changed, 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18fd949f..a50ad742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,6 @@
 *.jar
 *~
 
-qemu/config-all-devices.mak
-
 qemu/aarch64-softmmu/
 qemu/aarch64eb-softmmu/
 qemu/arm-softmmu/
diff --git a/qemu/Makefile b/qemu/Makefile
index b5588287..1f2cb54b 100644
--- a/qemu/Makefile
+++ b/qemu/Makefile
@@ -20,7 +20,6 @@ endif
 endif
 
 CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)
--include config-all-devices.mak
 
 include $(SRC_PATH)/rules.mak
 config-host.mak: $(SRC_PATH)/configure
@@ -45,24 +44,6 @@ configure: ;
 $(call set-vpath, $(SRC_PATH))
 
 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))
-
-ifeq ($(SUBDIR_DEVICES_MAK),)
-config-all-devices.mak:
-	$(call quiet-command,echo '# no devices' > $@,"  GEN   $@")
-else
-config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
-	$(call quiet-command, sed -n \
-             's|^\([^=]*\)=\(.*\)$$|\1:=$$(findstring y,$$(\1)\2)|p' \
-             $(SUBDIR_DEVICES_MAK) | sort -u > $@, \
-             "  GEN   $@")
-endif
-
--include $(SUBDIR_DEVICES_MAK_DEP)
-
-%/config-devices.mak:
-	$(call quiet-command, touch $@, "  GEN   $@")
 
 ifneq ($(wildcard config-host.mak),)
 include $(SRC_PATH)/Makefile.objs
@@ -76,9 +57,6 @@ config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
-SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
-
-$(SOFTMMU_SUBDIR_RULES): config-all-devices.mak
 
 subdir-%:
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
@@ -100,7 +78,6 @@ clean:
 
 distclean: clean
 	rm -f config-host.mak config-host.h*
-	rm -f config-all-devices.mak
 	rm -f config.log config.status
 	for d in $(TARGET_DIRS); do \
 	rm -rf $$d || exit 1 ; \
diff --git a/qemu/Makefile.target b/qemu/Makefile.target
index 356ce1c1..9f02ed96 100644
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -2,7 +2,6 @@
 
 include ../config-host.mak
 include config-target.mak
-include config-devices.mak
 include $(SRC_PATH)/rules.mak
 
 $(call set-vpath, $(SRC_PATH))