From 15538f651179053854b69e3eab8c31f2d813be7f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 26 Dec 2022 22:28:46 -0500 Subject: sim: rx: move libsim.a creation to top-level The objects are still compiled in the subdir, but the creation of the archive itself is in the top-level. This is a required step before we can move compilation itself up, and makes it easier to review. The downside is that each object compile is a recursive make instead of a single one. On my 4 core system, it adds ~100msec to the build per port, so it's not great, but it shouldn't be a big deal. This will go away of course once the top-level compiles objects. --- sim/rx/local.mk | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'sim/rx/local.mk') diff --git a/sim/rx/local.mk b/sim/rx/local.mk index 00978e9..c23ac4f 100644 --- a/sim/rx/local.mk +++ b/sim/rx/local.mk @@ -16,6 +16,30 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . +%C%_libsim_a_SOURCES = +%C%_libsim_a_LIBADD = \ + $(common_libcommon_a_OBJECTS) \ + %D%/fpu.o \ + %D%/load.o \ + %D%/mem.o \ + %D%/misc.o \ + %D%/reg.o \ + %D%/rx.o \ + %D%/syscalls.o \ + %D%/trace.o \ + %D%/gdb-if.o \ + %D%/err.o \ + %D%/modules.o +$(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h + +noinst_LIBRARIES += %D%/libsim.a + +%D%/%.o: %D%/%.c + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + +%D%/%.o: common/%.c + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + %C%_run_SOURCES = %C%_run_LDADD = \ %D%/main.o \ @@ -24,9 +48,5 @@ noinst_PROGRAMS += %D%/run -## Helper targets for running make from the top-level due to run's main.o. -%D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS) - $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - %C%docdir = $(docdir)/%C% %C%doc_DATA = %D%/README.txt -- cgit v1.1