sim: delete redundant SIM_EXTRA_ALL

We don't need a variable to add a dependency to the "all" target, and
having one doesn't really add value.  Switch to the target directly for
the few ports that actually use this.

diff --git a/sim/ChangeLog b/sim/ChangeLog
index f96a5dd93a219f86cc5f00300aa6798ca7a7bca9..102fdc6f181737c58371565184ee444753dd7a29 100644 (file)
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-27  Mike Frysinger  <vapier@gentoo.org>
+
+       * README-HACKING: Delete SIM_EXTRA_ALL.
+
 2021-02-21  Mike Frysinger  <vapier@gentoo.org>
 
        * m4/sim_ac_common.m4, m4/sim_ac_option_alignment.m4,

diff --git a/sim/README-HACKING b/sim/README-HACKING
index 0b72d96f5c2fe57b0e00d97f1a77ae2569619fed..fcf30624140999a06ea067b8360d3d347b894b91 100644 (file)
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@@ -85,8 +85,6 @@ SIM_EXTRA_CFLAGS =
 SIM_EXTRA_LIBS =
 # List of extra program dependencies.
 SIM_EXTRA_LIBDEPS =
-# Dependency of `all' to build any extra files.
-SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 75df703075c25fae3f23fa24c5e44fa46d3209c5..9ff2e7a1cabc2824b54b5cb076db56931e751cf3 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-27  Mike Frysinger  <vapier@gentoo.org>
+
+       * Make-common.in (SIM_EXTRA_ALL): Delete.
+       (all): Delete $(SIM_EXTRA_ALL).
+
 2021-02-21  Mike Frysinger  <vapier@gentoo.org>
 
        * acinclude.m4: Removed.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 99d55fb203839d1fe476c81b00e6c5ef9ba25906..84bd1be37dba91637c63a95cd286aad13df46c0d 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -128,8 +128,6 @@ SIM_EXTRA_LIBS =
 SIM_EXTRA_LIBDEPS =
 # List of main object files for `run'.
 SIM_RUN_OBJS = nrun.o
-# Dependency of `all' to build any extra files.
-SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.
@@ -258,7 +256,7 @@ RUNTESTFLAGS =
 callback_h = $(srcroot)/include/gdb/callback.h
 remote_sim_h = $(srcroot)/include/gdb/remote-sim.h
 
-all: $(SIM_EXTRA_ALL) libsim.a run$(EXEEXT) .gdbinit
+all: libsim.a run$(EXEEXT) .gdbinit
 
 libsim.a: $(LIB_OBJS)
        rm -f libsim.a

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index b518ae5fe07a6e58b7e5f966c1649e4cb47b3d26..75c80893a19ad934e605247ee9cf6f9a7682c9de 100644 (file)
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-27  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_EXTRA_ALL): Delete.
+       (all): New target.
+
 2021-02-21  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.

diff --git a/sim/erc32/Makefile.in b/sim/erc32/Makefile.in
index 406af1e682c3ce585349fd7dee02dc552f097076..0006922904b17b02646b7af6dbb0143dcc51dd52 100644 (file)
--- a/sim/erc32/Makefile.in
+++ b/sim/erc32/Makefile.in
@@ -24,7 +24,6 @@ READLINE_LIB = @READLINE@
 SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
 SIM_RUN_OBJS = sis.o
 SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
-SIM_EXTRA_ALL = sis
 SIM_EXTRA_INSTALL = install-sis
 SIM_EXTRA_CLEAN = clean-sis
 
@@ -38,6 +37,7 @@ SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcroot)
 # `sis' doesn't need interf.o.
 SIS_OFILES = exec.o erc32.o func.o help.o float.o
 
+all: sis
 sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
        $(CC) $(ALL_CFLAGS) -o sis \
          sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 5b3517648f0d10d7f44b16c92287395f95a5ec80..c9abba95140338ad5d2ee9111d0145777e2f70ba 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-27  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_EXTRA_ALL): Delete.
+       (all): New target.
+
 2021-02-21  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.

diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 7f1c9163b696578622065221713191c8cc7cd003..c94bd11282b899ca232ac1e6d1fe077c509d24d7 100644 (file)
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -79,7 +79,7 @@ SIM_EXTRA_CFLAGS = $(SIM_SUBTARGET)
 SIM_EXTRA_CLEAN = clean-extra
 SIM_EXTRA_DISTCLEAN = distclean-extra
 
-SIM_EXTRA_ALL = $(SIM_@sim_gen@_ALL)
+all: $(SIM_@sim_gen@_ALL)
 
 SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS)
 

diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 0234fd4e022f0b9b71a189146b02063541080b0f..0d99dbbf330ab70f120f06db3bcfd3770e77fa2d 100644 (file)
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-27  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_EXTRA_ALL): Delete.
+
 2021-02-21  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.

diff --git a/sim/msp430/Makefile.in b/sim/msp430/Makefile.in
index 3c7e5ef910d1e75f116cb6d5d87faa3ace0b3e63..4bb13681a1e21ab49b48348e81a3fd49818cc02b 100644 (file)
--- a/sim/msp430/Makefile.in
+++ b/sim/msp430/Makefile.in
@@ -38,8 +38,6 @@ SIM_EXTRA_CFLAGS =
 SIM_EXTRA_LIBS =
 # List of extra program dependencies.
 SIM_EXTRA_LIBDEPS =
-# Dependency of `all' to build any extra files.
-SIM_EXTRA_ALL =
 # Dependency of `install' to install any extra files.
 SIM_EXTRA_INSTALL =
 # Dependency of `clean' to clean any extra files.