diff options
Diffstat (limited to 'sim/common/Make-common.in')
| -rw-r--r-- | sim/common/Make-common.in | 117 |
1 files changed, 38 insertions, 79 deletions
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 7db8ba7..4e15424 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -132,7 +132,7 @@ all: libsim.a run $(SIM_EXTRA_ALL) libsim.a: $(LIB_OBJS) rm -f libsim.a - $(AR) $(ARFLAGS) libsim.a $(LIB_OBJS) + $(AR) $(AR_FLAGS) libsim.a $(LIB_OBJS) $(RANLIB) libsim.a run: $(SIM_RUN_OBJS) libsim.a $(LIBDEPS) @@ -181,6 +181,9 @@ sim_main_headers = \ $(srcdir)/../common/sim-trace.h \ $(srcdir)/../common/sim-profile.h \ $(srcdir)/../common/sim-engine.h \ + $(srcdir)/../common/sim-events.h \ + $(srcdir)/../common/sim-watch.h \ + $(srcdir)/../common/sim-assert.h \ tconfig.h sim-assert_h = $(srcdir)/../common/sim-assert.h @@ -209,69 +212,41 @@ BUILT_SRC_FROM_COMMON= \ sim-config.c \ sim-io.c -sim-abort.o: sim-abort.c \ +sim-abort.o: $(srcdir)/../common/sim-abort.c \ $(SIM_EXTRA_DEPS) -sim-abort.c: $(srcdir)/../common/sim-abort.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-abort.c $(ALL_CFLAGS) -sim-bits.o: sim-bits.c $(sim-bits_h) $(sim-n-bits_h) $(sim-assert_h) \ +sim-bits.o: $(srcdir)/../common/sim-bits.c $(sim-bits_h) $(sim-n-bits_h) \ $(SIM_EXTRA_DEPS) -sim-bits.c: $(srcdir)/../common/sim-bits.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-bits.c $(ALL_CFLAGS) -sim-config.o: sim-config.c $(sim-config_h) $(sim-nconfig_h) $(sim-assert_h) \ +sim-config.o: $(srcdir)/../common/sim-config.c $(sim-config_h) $(sim-nconfig_h) \ $(SIM_EXTRA_DEPS) -sim-config.c: $(srcdir)/../common/sim-config.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-config.c $(ALL_CFLAGS) -sim-core.o: sim-core.c $(sim-core_h) $(sim-n-core_h) \ +sim-core.o: $(srcdir)/../common/sim-core.c $(sim-core_h) $(sim-n-core_h) \ $(SIM_EXTRA_DEPS) -sim-core.c: $(srcdir)/../common/sim-core.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-core.c $(ALL_CFLAGS) -sim-endian.o: sim-endian.c $(sim-endian_h) $(sim-n-endian_h) $(sim-assert_h) \ +sim-endian.o: $(srcdir)/../common/sim-endian.c $(sim-endian_h) $(sim-n-endian_h) \ $(SIM_EXTRA_DEPS) -sim-endian.c: $(srcdir)/../common/sim-endian.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-endian.c $(ALL_CFLAGS) -sim-engine.o: sim-engine.c $(sim_main_headers) $(sim-engine_h) $(sim-assert_h) \ +sim-engine.o: $(srcdir)/../common/sim-engine.c $(sim_main_headers) $(sim-engine_h) \ $(SIM_EXTRA_DEPS) -sim-engine.c: $(srcdir)/../common/sim-engine.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-engine.c $(ALL_CFLAGS) -sim-events.o: sim-events.c $(sim-events_h) $(sim-assert_h) \ +sim-events.o: $(srcdir)/../common/sim-events.c $(sim-events_h) \ $(SIM_EXTRA_DEPS) -sim-events.c: $(srcdir)/../common/sim-events.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-events.c $(ALL_CFLAGS) -sim-fpu.o: sim-fpu.c $(sim-fpu_h) $(sim-assert_h) \ +sim-fpu.o: $(srcdir)/../common/sim-fpu.c $(sim-fpu_h) \ $(SIM_EXTRA_DEPS) -sim-fpu.c: $(srcdir)/../common/sim-fpu.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-fpu.c $(ALL_CFLAGS) + +sim-hload.o: $(srcdir)/../common/sim-hload.c $(sim-assert_h) \ + $(SIM_EXTRA_DEPS) + $(CC) -c $(srcdir)/../common/sim-hload.c $(ALL_CFLAGS) sim-inline.c: $(srcdir)/../common/sim-inline.c rm -f $@ tmp-$@ @@ -279,13 +254,9 @@ sim-inline.c: $(srcdir)/../common/sim-inline.c cat $(srcdir)/../common/$@ >> tmp-$@ $(srcdir)/../../move-if-change tmp-$@ $@ -sim-io.o: sim-io.c $(sim_main_headers) $(sim-io_h) $(sim-assert_h) \ +sim-io.o: $(srcdir)/../common/sim-io.c $(sim_main_headers) $(sim-io_h) \ $(SIM_EXTRA_DEPS) -sim-io.c: $(srcdir)/../common/sim-io.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-io.c $(ALL_CFLAGS) sim-module.o: $(srcdir)/../common/sim-module.c $(sim_main_headers) \ $(sim-io_h) $(SIM_EXTRA_DEPS) @@ -295,37 +266,21 @@ sim-options.o: $(srcdir)/../common/sim-options.c $(sim_main_headers) \ $(sim-options_h) $(sim-io_h) $(SIM_EXTRA_DEPS) $(CC) -c $(srcdir)/../common/sim-options.c $(ALL_CFLAGS) -sim-reason.o: sim-reason.c $(sim_main_headers) $(sim-assert_h) \ +sim-reason.o: $(srcdir)/../common/sim-reason.c $(sim_main_headers) \ $(SIM_EXTRA_DEPS) -sim-reason.c: $(srcdir)/../common/sim-reason.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-reason.c $(ALL_CFLAGS) -sim-resume.o: sim-resume.c $(sim_main_headers) $(sim-assert_h) \ +sim-resume.o: $(srcdir)/../common/sim-resume.c $(sim_main_headers) \ $(SIM_EXTRA_DEPS) -sim-resume.c: $(srcdir)/../common/sim-resume.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-resume.c $(ALL_CFLAGS) -sim-run.o: sim-run.c $(sim_main_headers) $(sim-assert_h) \ +sim-run.o: $(srcdir)/../common/sim-run.c $(sim_main_headers) \ $(SIM_EXTRA_DEPS) -sim-run.c: $(srcdir)/../common/sim-run.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-run.c $(ALL_CFLAGS) -sim-stop.o: sim-stop.c $(sim_main_headers) $(sim-assert_h) \ +sim-stop.o: $(srcdir)/../common/sim-stop.c $(sim_main_headers) \ $(SIM_EXTRA_DEPS) -sim-stop.c: $(srcdir)/../common/sim-stop.c - rm -f $@ tmp-$@ - echo "# 1 \"$(srcdir)/../common/$@\"" > tmp-$@ - cat $(srcdir)/../common/$@ >> tmp-$@ - $(srcdir)/../../move-if-change tmp-$@ $@ + $(CC) -c $(srcdir)/../common/sim-stop.c $(ALL_CFLAGS) sim-trace.o: $(srcdir)/../common/sim-trace.c $(sim_main_headers) \ $(sim-options_h) $(sim-io_h) $(SIM_EXTRA_DEPS) @@ -343,6 +298,10 @@ sim-utils.o: $(srcdir)/../common/sim-utils.c $(sim_main_headers) \ $(SIM_EXTRA_DEPS) $(CC) -c $(srcdir)/../common/sim-utils.c $(ALL_CFLAGS) +sim-watch.o: $(srcdir)/../common/sim-watch.c $(sim_main_headers) \ + $(SIM_EXTRA_DEPS) + $(CC) -c $(srcdir)/../common/sim-watch.c $(ALL_CFLAGS) + sim-load.o: $(srcdir)/../common/sim-load.c $(CC) -c $(srcdir)/../common/sim-load.c $(ALL_CFLAGS) |