--- gforth/Makefile.in 2011/01/09 15:29:14 1.456 +++ gforth/Makefile.in 2011/11/12 15:11:56 1.460 @@ -47,6 +47,29 @@ PATHSEP = @PATHSEP@ EC = @EC@ +# ------------ Install Directories + +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +srcdir = @srcdir@ +bindir = @bindir@ +#read-only architecture-independent files +datarootdir = @datarootdir@ +datadir = @datadir@ +#read-only architecture-dependent non-ascii files +libdir = @libdir@ +libccdir = $(subst $(DESTDIR),,$(libdir)/gforth/$(VERSION)/libcc-named/) +includedir = @includedir@ +infodir = @infodir@ +htmldir = @htmldir@ +mandir = @mandir@ +man1dir= $(mandir)/man1 +man1ext= .1 +#older emacses have their site-lisp in $(libdir)/emacs/ +emacssitelispdir=@lispdir@ +siteforthdir=$(datadir)/gforth/site-forth + # ------------- Utility programs SHELL = /bin/sh @@ -117,29 +140,6 @@ LDLIBS = @LIBS@ STACK_CACHE_REGS = @STACK_CACHE_REGS@ STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@ -# ------------ Install Directories - -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -srcdir = @srcdir@ -bindir = @bindir@ -#read-only architecture-independent files -datarootdir = @datarootdir@ -datadir = @datadir@ -#read-only architecture-dependent non-ascii files -libdir = @libdir@ -libccdir = $(subst $(DESTDIR),,$(libdir)/gforth/$(VERSION)/libcc-named/) -includedir = @includedir@ -infodir = @infodir@ -htmldir = @htmldir@ -mandir = @mandir@ -man1dir= $(mandir)/man1 -man1ext= .1 -#older emacses have their site-lisp in $(libdir)/emacs/ -emacssitelispdir=@lispdir@ -siteforthdir=$(datadir)/gforth/site-forth - PROFOBJS = @PROFOBJS@ PROFEXES = @PROFEXES@ @@ -181,6 +181,7 @@ KERN_SRC = \ kernel/basics.fs \ kernel/int.fs \ kernel/comp.fs \ + kernel/recognizer.fs \ kernel/io.fs \ kernel/input.fs \ kernel/license.fs \ @@ -245,6 +246,7 @@ GFORTH_FI_SRC2=\ simp-see.fs \ source.fs \ startup.fs \ + str-exec.fs \ struct.fs \ struct0x.fs \ stuff.fs \ @@ -683,14 +685,14 @@ check: gforths gforth.fi $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 + #$(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 @echo "*** Check successful ***" ./gforth-fast --diag -e bye checkone test: gforth.fi engine/prim-s.i - $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out + $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>/dev/null | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out $(FORTH) test/other.fs -e bye $(FORTHS) test/signals.fs -e bye $(FORTHS) test/coremore.fs test/gforth.fs test/macros.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out