From 540c3ce0560de4feaeedeefb8b4e0ca385815f69 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Thu, 22 Dec 2022 14:23:57 -0800
Subject: [PATCH] Remove non-installed header lists from Makefile fragments

It's just dead code.  (Dependences on headers are auto-generated as
`.d` files.)
---
 Makefile.in                 |  1 -
 fdt/fdt.mk.in               |  5 -----
 fesvr/fesvr.mk.in           |  4 +---
 riscv/riscv.mk.in           | 34 ----------------------------------
 softfloat/softfloat.mk.in   |  9 ---------
 spike_main/spike_main.mk.in |  2 --
 6 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7a297572..c11561ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -330,7 +330,6 @@ clean-$(1) :
 libs += lib$(1).a
 objs += $$($(2)_objs)
 srcs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_srcs)) 
-hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs)) $$($(2)_gen_hdrs)
 junk += $$($(2)_junk)
 deps += $$($(2)_deps)
 
diff --git a/fdt/fdt.mk.in b/fdt/fdt.mk.in
index 273375ef..8c8dbe53 100644
--- a/fdt/fdt.mk.in
+++ b/fdt/fdt.mk.in
@@ -1,10 +1,5 @@
 fdt_subproject_deps = \
 
-fdt_hdrs = \
-	fdt.h \
-	libfdt.h \
-	libfdt_env.h \
-
 fdt_c_srcs = \
 	fdt.c \
 	fdt_ro.c \
diff --git a/fesvr/fesvr.mk.in b/fesvr/fesvr.mk.in
index 695de527..e0d143f3 100644
--- a/fesvr/fesvr.mk.in
+++ b/fesvr/fesvr.mk.in
@@ -1,4 +1,4 @@
-fesvr_hdrs = \
+fesvr_install_hdrs = \
   byteorder.h \
   elf.h \
   elfloader.h \
@@ -15,8 +15,6 @@ fesvr_hdrs = \
   rfb.h \
   tsi.h \
 
-fesvr_install_hdrs = $(fesvr_hdrs)
-
 fesvr_install_config_hdr = yes
 
 fesvr_install_lib = yes
diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 9e52a3f0..6e405690 100644
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -13,40 +13,6 @@ riscv_install_shared_lib = yes
 
 riscv_install_prog_srcs = \
 
-riscv_hdrs = \
-	abstract_device.h \
-	abstract_interrupt_controller.h \
-	common.h \
-	decode.h \
-	decode_macros.h \
-	devices.h \
-	dts.h \
-	isa_parser.h \
-	mmu.h \
-	cfg.h \
-	processor.h \
-	p_ext_macros.h \
-	v_ext_macros.h \
-	sim.h \
-	simif.h \
-	trap.h \
-	encoding.h \
-	cachesim.h \
-	memtracer.h \
-	mmio_plugin.h \
-	tracer.h \
-	extension.h \
-	rocc.h \
-	insn_template.h \
-	debug_module.h \
-	debug_rom_defines.h \
-	remote_bitbang.h \
-	jtag_dtm.h \
-	csrs.h \
-	triggers.h \
-	vector_unit.h \
-	socketif.h \
-
 riscv_install_hdrs = \
 	abstract_device.h \
 	abstract_interrupt_controller.h \
diff --git a/softfloat/softfloat.mk.in b/softfloat/softfloat.mk.in
index 6e7bbe93..e7f4a3e4 100644
--- a/softfloat/softfloat.mk.in
+++ b/softfloat/softfloat.mk.in
@@ -1,14 +1,5 @@
 softfloat_subproject_deps =
 
-softfloat_hdrs = \
-  internals.h \
-  platform.h \
-  primitives.h \
-  primitiveTypes.h \
-  softfloat.h \
-  softfloat_types.h \
-  specialize.h \
-
 softfloat_c_srcs = \
 	f128_add.c \
 	f128_classify.c \
diff --git a/spike_main/spike_main.mk.in b/spike_main/spike_main.mk.in
index ec6c8174..25a7a6c6 100644
--- a/spike_main/spike_main.mk.in
+++ b/spike_main/spike_main.mk.in
@@ -11,8 +11,6 @@ spike_main_install_prog_srcs = \
 	xspike.cc \
 	termios-xspike.cc \
 
-spike_main_hdrs = \
-
 spike_main_srcs = \
 
 spike_main_CFLAGS = -fPIC