sim: build: drop support for subdir extra deps

Nothing uses this hook anymore, so punt it.  It was largely used to
track generated files (which we do in the top-level now) and extra
header files (which we use automake depgen for now).

diff --git a/sim/README-HACKING b/sim/README-HACKING
index c47eef8ce73b7fa864c63b5de1b7e2e493521d9b..38d871b15141148c8a69eac6f1840559e9b6e43f 100644 (file)
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@@ -46,9 +46,6 @@ The Makefile.in of a simulator using the common framework should look like:
 
 # List of object files, less common parts.
 SIM_OBJS =
-# List of extra dependencies.
-# Generally this consists of simulator specific files included by sim-main.h.
-SIM_EXTRA_DEPS =
 # List of flags to always pass to $(CC).
 SIM_EXTRA_CFLAGS =
 # Dependency of `clean' to clean any extra files.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index b56a49a0051f6f2829f6a0787afd25af2ee18757..ab26c49435922c5a3c59bf85237da9c35b915568 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -85,9 +85,6 @@ POSTCOMPILE = @true
 
 # List of object files, less common parts.
 SIM_OBJS =
-# List of extra dependencies.
-# Generally this consists of simulator specific files included by sim-main.h.
-SIM_EXTRA_DEPS =
 # List of flags to always pass to $(CC).
 SIM_EXTRA_CFLAGS =
 # List of main object files for `run'.
@@ -185,17 +182,6 @@ override POSTCOMPILE =
 endif
 
 all_object_files = $(LIB_OBJS) $(SIM_RUN_OBJS)
-generated_files = \
-       $(SIM_EXTRA_DEPS)
-
-# Ensure that generated files are created early.  Use order-only
-# dependencies if available.  They require GNU make 3.80 or newer,
-# and the .VARIABLES variable was introduced at the same time.
-ifdef .VARIABLES
-$(all_object_files): | $(generated_files)
-else
-$(all_object_files) : $(generated_files)
-endif
 
 # Dependencies.
 -include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files))