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.
This commit is contained in:
Mike Frysinger
2021-02-21 19:02:47 -05:00
parent b2287f90e4
commit f8069d55c1
10 changed files with 26 additions and 9 deletions

View File

@@ -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> 2021-02-21 Mike Frysinger <vapier@gentoo.org>
* m4/sim_ac_common.m4, m4/sim_ac_option_alignment.m4, * m4/sim_ac_common.m4, m4/sim_ac_option_alignment.m4,

View File

@@ -85,8 +85,6 @@ SIM_EXTRA_CFLAGS =
SIM_EXTRA_LIBS = SIM_EXTRA_LIBS =
# List of extra program dependencies. # List of extra program dependencies.
SIM_EXTRA_LIBDEPS = SIM_EXTRA_LIBDEPS =
# Dependency of `all' to build any extra files.
SIM_EXTRA_ALL =
# Dependency of `install' to install any extra files. # Dependency of `install' to install any extra files.
SIM_EXTRA_INSTALL = SIM_EXTRA_INSTALL =
# Dependency of `clean' to clean any extra files. # Dependency of `clean' to clean any extra files.

View File

@@ -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> 2021-02-21 Mike Frysinger <vapier@gentoo.org>
* acinclude.m4: Removed. * acinclude.m4: Removed.

View File

@@ -128,8 +128,6 @@ SIM_EXTRA_LIBS =
SIM_EXTRA_LIBDEPS = SIM_EXTRA_LIBDEPS =
# List of main object files for `run'. # List of main object files for `run'.
SIM_RUN_OBJS = nrun.o SIM_RUN_OBJS = nrun.o
# Dependency of `all' to build any extra files.
SIM_EXTRA_ALL =
# Dependency of `install' to install any extra files. # Dependency of `install' to install any extra files.
SIM_EXTRA_INSTALL = SIM_EXTRA_INSTALL =
# Dependency of `clean' to clean any extra files. # Dependency of `clean' to clean any extra files.
@@ -258,7 +256,7 @@ RUNTESTFLAGS =
callback_h = $(srcroot)/include/gdb/callback.h callback_h = $(srcroot)/include/gdb/callback.h
remote_sim_h = $(srcroot)/include/gdb/remote-sim.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) libsim.a: $(LIB_OBJS)
rm -f libsim.a rm -f libsim.a

View File

@@ -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> 2021-02-21 Mike Frysinger <vapier@gentoo.org>
* configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4. * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.

View File

@@ -24,7 +24,6 @@ READLINE_LIB = @READLINE@
SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
SIM_RUN_OBJS = sis.o SIM_RUN_OBJS = sis.o
SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
SIM_EXTRA_ALL = sis
SIM_EXTRA_INSTALL = install-sis SIM_EXTRA_INSTALL = install-sis
SIM_EXTRA_CLEAN = clean-sis SIM_EXTRA_CLEAN = clean-sis
@@ -38,6 +37,7 @@ SIM_EXTRA_CFLAGS = -DFAST_UART -I$(srcroot)
# `sis' doesn't need interf.o. # `sis' doesn't need interf.o.
SIS_OFILES = exec.o erc32.o func.o help.o float.o SIS_OFILES = exec.o erc32.o func.o help.o float.o
all: sis
sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
$(CC) $(ALL_CFLAGS) -o sis \ $(CC) $(ALL_CFLAGS) -o sis \
sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)

View File

@@ -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> 2021-02-21 Mike Frysinger <vapier@gentoo.org>
* configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4. * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.

View File

@@ -79,7 +79,7 @@ SIM_EXTRA_CFLAGS = $(SIM_SUBTARGET)
SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_CLEAN = clean-extra
SIM_EXTRA_DISTCLEAN = distclean-extra SIM_EXTRA_DISTCLEAN = distclean-extra
SIM_EXTRA_ALL = $(SIM_@sim_gen@_ALL) all: $(SIM_@sim_gen@_ALL)
SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS) SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS)

View File

@@ -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> 2021-02-21 Mike Frysinger <vapier@gentoo.org>
* configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4. * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.

View File

@@ -38,8 +38,6 @@ SIM_EXTRA_CFLAGS =
SIM_EXTRA_LIBS = SIM_EXTRA_LIBS =
# List of extra program dependencies. # List of extra program dependencies.
SIM_EXTRA_LIBDEPS = SIM_EXTRA_LIBDEPS =
# Dependency of `all' to build any extra files.
SIM_EXTRA_ALL =
# Dependency of `install' to install any extra files. # Dependency of `install' to install any extra files.
SIM_EXTRA_INSTALL = SIM_EXTRA_INSTALL =
# Dependency of `clean' to clean any extra files. # Dependency of `clean' to clean any extra files.