--- gforth/Makefile.in 2003/01/03 17:28:12 1.241 +++ gforth/Makefile.in 2003/01/10 21:43:41 1.244 @@ -344,7 +344,7 @@ SOURCES = $(CVSDIRS) compat Makefile.in prim peeprules.vmg engine/engine.c engine/main.c \ engine/io.c engine/support.c engine/memcmpc.c engine/signals.c \ $(ARCHS) \ - engine/peephole.c engine/profile.c \ + engine/profile.c \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \ engine/ansidecl.h engine/memmove.c \ @@ -367,8 +367,9 @@ GEN = gforth$(EXE) gforth-ditc$(EXE) gfo # things that need a working forth system to be generated FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \ - engine/prim_superend.i engine/peephole.i engine/profile.i \ - engine/prim_num.i engine/prim_grp.i + engine/prim_superend.i engine/profile.i \ + engine/prim_num.i engine/prim_grp.i \ + engine/config.h FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.fs FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, @@ -550,12 +551,12 @@ uninstall: FORCE @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth" check: gforths gforth.fi - make checkone ENGINE="./gforth --no-dynamic" &>/dev/null - make checkone ENGINE="./gforth-itc" &>/dev/null - make checkone ENGINE="./gforth-ditc" &>/dev/null - make checkone ENGINE="./gforth-fast --no-dynamic" &>/dev/null - make checkone ENGINE="./gforth" &>/dev/null - make checkone ENGINE="./gforth-fast" &>/dev/null + $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-ditc" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth" >/dev/null 2>&1 + $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 @echo "*** Check successful ***" checkone test: gforth$(EXE) gforth.fi @@ -582,17 +583,17 @@ onebench: all-bench: gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi @echo "*** gforth-fast dynamic:" - @make onebench ENGINE_FAST="gforth-fast --dynamic" + @$(MAKE) onebench ENGINE_FAST="gforth-fast --dynamic" @echo "*** gforth-fast not dynamic:" - @make onebench ENGINE_FAST="gforth-fast --no-dynamic" + @$(MAKE) onebench ENGINE_FAST="gforth-fast --no-dynamic" @echo "*** gforth dynamic:" - @make onebench ENGINE_FAST="gforth --dynamic" + @$(MAKE) onebench ENGINE_FAST="gforth --dynamic" @echo "*** gforth not dynamic:" - @make onebench ENGINE_FAST="gforth --no-dynamic" + @$(MAKE) onebench ENGINE_FAST="gforth --no-dynamic" @echo "*** gforth-itc:" - @make onebench ENGINE_FAST=gforth-itc + @$(MAKE) onebench ENGINE_FAST=gforth-itc @echo "*** gforth-ditc:" - @make onebench ENGINE_FAST=gforth-ditc + @$(MAKE) onebench ENGINE_FAST=gforth-ditc # ------------- Make forth images