Diff for /gforth/Makefile.in between versions 1.279 and 1.363

version 1.279, 2003/09/01 22:12:46 version 1.363, 2007/08/19 21:33:50
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 48  PATHSEP = @PATHSEP@ Line 48  PATHSEP = @PATHSEP@
   
 osclass = @OSCLASS@  osclass = @OSCLASS@
   
   EC = @EC@
   
 # ------------- Utility programs  # ------------- Utility programs
   
 SHELL   = /bin/sh  SHELL   = /bin/sh
Line 58  MV = mv Line 60  MV = mv
 TAR     = tar cf -  TAR     = tar cf -
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_PROGRAM = @INSTALL_PROGRAM@
   MASSAGE_EXE = @MASSAGE_EXE@
   INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@  INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@  INSTALL_INFO = @INSTALL_INFO@
 LN_S    = @LN_S@  LN_S    = @LN_S@
   M4      = @M4@
 GCC     = @CC@  GCC     = @CC@
 CC      = $(GCC)  CC      = $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)  FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
Line 75  FORTHS = $(ENGINE) $(FORTHS_ARGS) Line 80  FORTHS = $(ENGINE) $(FORTHS_ARGS)
 # possible to override this variable at the command line for an initial build (jaw)  # possible to override this variable at the command line for an initial build (jaw)
 BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)  BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 # the forth system plus flags we use to build  # the forth system plus flags we use to build
 FORTHB = $(BUILDFORTH) -e 3 exboot.fs -e 'fpath= .|~+|$(srcdir)'  FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs  # the Forth system for running prims2x.fs
 FORTHP = $(FORTH)  FORTHP = $(FORTH)
 ENGINE_FAST = $(ENGINE)-fast  ENGINE_FAST = $(ENGINE)-fast
Line 85  FORTHK = $(ENGINE) $(FORTHKFLAGS) Line 90  FORTHK = $(ENGINE) $(FORTHKFLAGS)
 #FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi)  #FORTHP = $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 #the "-2 image-included-files +!" undoes the change to image-included-files  #the "-2 image-included-files +!" undoes the change to image-included-files
 # in exboot.fs  # in exboot.fs
 STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@  STARTUP = exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi -e  TEXI2DVI = @TEXI2DVI@
 TEXI2PDF = texi2dvi --pdf -e  TEXI2PDF = @TEXI2DVI@ --pdf
 DVI2PS  = dvips -t letterSize -Z  DVI2PS  = dvips -t letterSize -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/  #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 MAKEINFO = makeinfo  MAKEINFO = makeinfo
Line 108  XLDFLAGS = @LDFLAGS@ Line 113  XLDFLAGS = @LDFLAGS@
 LDFLAGS =  $(DEBUGFLAG) $(XLDFLAGS)  LDFLAGS =  $(DEBUGFLAG) $(XLDFLAGS)
 LDLIBS  = @LIBS@  LDLIBS  = @LIBS@
   
 # ------------  Install Directorys  STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@
   
   # ------------  Install Directories
   
 VPATH = @srcdir@  VPATH = @srcdir@
 prefix = @prefix@  prefix = @prefix@
 exec_prefix = @exec_prefix@  exec_prefix = @exec_prefix@
 srcdir = @srcdir@  srcdir = @srcdir@
 bindir = $(exec_prefix)/bin  bindir = @bindir@
 #read-only architecture-independent files  #read-only architecture-independent files
 datadir = $(prefix)/share  datadir = @datadir@
 #read-only architecture-dependent non-ascii files  #read-only architecture-dependent non-ascii files
 libdir = $(prefix)/lib  libdir = @libdir@
 infodir = $(prefix)/info  includedir = @includedir@
 mandir = $(prefix)/man  infodir = @infodir@
   htmldir = @htmldir@
   mandir = @mandir@
 man1dir= $(mandir)/man1  man1dir= $(mandir)/man1
 man1ext= .1  man1ext= .1
 #older emacses have their site-lisp in $(libdir)/emacs/  #older emacses have their site-lisp in $(libdir)/emacs/
 emacssitelispdir=@lispdir@  emacssitelispdir=@lispdir@
 siteforthdir=$(datadir)/gforth/site-forth  siteforthdir=$(datadir)/gforth/site-forth
   
   PROFOBJS = @PROFOBJS@
   PROFEXES = @PROFEXES@
   
 CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \  CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \
         compat/CVS unix/CVS \          compat/CVS unix/CVS \
         arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \          arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \
         arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \          arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \
         arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \          arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \
         arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \          arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \
         arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS          arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \
           arch/arm/CVS arch/r8c/CVS
   
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h  INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h
   
 KERN_SRC = \  KERN_SRC = \
         mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \          mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
Line 143  KERN_SRC = \ Line 156  KERN_SRC = \
         kernel/aliases0.fs \          kernel/aliases0.fs \
         kernel/aliases.fs \          kernel/aliases.fs \
         kernel/args.fs \          kernel/args.fs \
         chains.fs \  
         kernel/cbr.fs \          kernel/cbr.fs \
         kernel/cloop.fs \          kernel/cloop.fs \
         kernel/cond.fs \          kernel/cond.fs \
Line 172  KERN_SRC = \ Line 184  KERN_SRC = \
         kernel/saccept.fs \          kernel/saccept.fs \
         kernel/doers.fs \          kernel/doers.fs \
         kernel/getdoers.fs \          kernel/getdoers.fs \
         kernel/pass.fs          kernel/pass.fs \
           kernel/xchars.fs
   
 EC_SRC = \  EC_SRC = \
         asm/README \          asm/README \
         asm/bitmask.fs \          asm/bitmask.fs \
         asm/numref.fs \          asm/numref.fs \
           chains.fs \
         asm/basic.fs \          asm/basic.fs \
         asm/generic.fs \          asm/generic.fs \
         asm/target.fs \          asm/target.fs \
Line 186  EC_SRC = \ Line 200  EC_SRC = \
         ec/shex.fs \          ec/shex.fs \
         ec/builttag.fs \          ec/builttag.fs \
         ec/dotx.fs \          ec/dotx.fs \
         ec/nesting.fs          ec/nesting.fs \
           build-ec.in
   
 GFORTH_FI_SRC = \  GFORTH_FI_SRC = \
         assert.fs \          assert.fs \
Line 197  GFORTH_FI_SRC = \ Line 212  GFORTH_FI_SRC = \
         code.fs \          code.fs \
         debug.fs \          debug.fs \
         debugs.fs \          debugs.fs \
           dis-gdb.fs \
         ekey.fs \          ekey.fs \
           envos.fs \
         savesys.fs \          savesys.fs \
         environ.fs \          environ.fs \
         errors.fs \          errors.fs \
Line 209  GFORTH_FI_SRC = \ Line 226  GFORTH_FI_SRC = \
         hash.fs \          hash.fs \
         history.fs \          history.fs \
         intcomp.fs \          intcomp.fs \
           libcc.fs \
         locals.fs \          locals.fs \
         look.fs \          look.fs \
         quotes.fs \          quotes.fs \
Line 219  GFORTH_FI_SRC = \ Line 237  GFORTH_FI_SRC = \
         source.fs \          source.fs \
         startup.fs \          startup.fs \
         struct.fs \          struct.fs \
           struct0x.fs \
         stuff.fs \          stuff.fs \
         tasker.fs \          tasker.fs \
         termsize.fs \          termsize.fs \
           utf-8.fs \
         vt100.fs \          vt100.fs \
         vt100key.fs \          vt100key.fs \
         wordinfo.fs \          wordinfo.fs \
         arch/386/asm.fs arch/386/disasm.fs \          arch/386/asm.fs arch/386/disasm.fs \
         arch/alpha/asm.fs arch/alpha/disasm.fs \          arch/amd64/asm.fs arch/amd64/disasm.fs \
         arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs          arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\
           arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \
           arch/mips/testasm.fs arch/mips/testdisasm.fs \
           arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs
   
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \
         ans-report.fs ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         colorize.fs comp-i.fs \          colorize.fs comp-i.fs complex.fs \
         dosekey.fs doskey.fs ds2texi.fs \          depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \
         envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \          envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.fs \
         glosgen.fs gray.fs httpd.fs proxy.fs \          fsl-util.4th glosgen.fs gray.fs httpd.fs proxy.fs \
         make-app.fs doc/makedoc.fs \          make-app.fs doc/makedoc.fs \
         locate.fs more.fs other.fs prims2x.fs random.fs \          locate.fs more.fs onebench.fs other.fs prims2x.fs random.fs \
         sokoban.fs string.fs table.fs tags.fs \          regexp.fs sokoban.fs string.fs table.fs tags.fs \
         tt.fs \          tt.fs \
         unbuffer.fs wordsets.fs \          unbuffer.fs wordsets.fs xwords.fs \
         test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \          test/tester.fs test/ttester.fs
           test/coretest.fs test/postpone.fs test/dbltest.fs \
         test/string.fs test/float.fs test/gforth.fs \          test/string.fs test/float.fs test/gforth.fs \
         test/other.fs test/signals.fs test/checkans.fs \          test/other.fs test/signals.fs test/checkans.fs \
           test/primtest.fs test/coreext.fs test/deferred.fs \
           test/coremore.fs test/gforth-nofast.fs test/libcc.fs \
         bubble.fs siev.fs matrix.fs fib.fs \          bubble.fs siev.fs matrix.fs fib.fs \
         oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \          oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
         moofglos.fs fixpath.fs \          moofglos.fs fixpath.fs \
         add.fs lib.fs oldlib.fs fflib.fs sieve.fs unix/socket.fs          add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \
           endtry-iferror.fs recover-endtry.fs
   
 COMPAT = compat/README \  COMPAT = compat/README \
         compat/anslocal.fs \          compat/anslocal.fs \
Line 254  COMPAT = compat/README \ Line 281  COMPAT = compat/README \
         compat/control.fs \          compat/control.fs \
         compat/defer.fs \          compat/defer.fs \
         compat/exception.fs \          compat/exception.fs \
           compat/execute-parsing.fs \
         compat/loops.fs \          compat/loops.fs \
         compat/required.fs \          compat/required.fs \
         compat/strcomp.fs \          compat/strcomp.fs \
Line 268  ALLSUBDIRS = engine Line 296  ALLSUBDIRS = engine
   
 ARCHS = \  ARCHS = \
         arch/generic/machine.h \          arch/generic/machine.h \
           arch/generic/128bit.h \
         arch/m68k/machine.h \          arch/m68k/machine.h \
         arch/mips/machine.h \          arch/mips/machine.h \
         arch/386/machine.h \          arch/386/machine.h \
Line 277  ARCHS = \ Line 306  ARCHS = \
         arch/power/machine.h \          arch/power/machine.h \
         arch/power/_sync_cache_range.c \          arch/power/_sync_cache_range.c \
         arch/alpha/machine.h \          arch/alpha/machine.h \
           arch/arm/machine.h \
           arch/arm/cacheflush0.c \
           arch/arm/cacheflush1.c \
           arch/arm/cacheflush2.c \
         arch/ia64/machine.h \          arch/ia64/machine.h \
           arch/ia64/flush_icache_block.c \
           arch/amd64/machine.h \
         arch/4stack/README \          arch/4stack/README \
         arch/4stack/asm.fs \          arch/4stack/asm.fs \
         arch/4stack/mach.fs \          arch/4stack/mach.fs \
Line 287  ARCHS = \ Line 322  ARCHS = \
         arch/misc/README \          arch/misc/README \
         arch/misc/asm.fs \          arch/misc/asm.fs \
         arch/misc/mach.fs \          arch/misc/mach.fs \
           arch/misc/optcmove.fs \
         arch/misc/prim.fs \          arch/misc/prim.fs \
         arch/misc/sim.fs \          arch/misc/sim.fs \
         arch/misc/sokoban.fs \          arch/misc/sokoban.fs \
         arch/misc/tt.fs \          arch/misc/tt.fs \
         arch/6502/asm.fs \  
         arch/6502/prim.fs \          arch/6502/prim.fs \
         arch/6502/mach.fs \          arch/6502/mach.fs \
         arch/6502/zero.fs \  
         arch/6502/softuart.fs \  
         arch/6502/cold.fs \  
         arch/8086/asm.fs \  
         arch/8086/mach.fs \  
         arch/8086/mach.sh \  
         arch/8086/prim.fs \  
         arch/avr/asm.fs \  
         arch/c165/asm.fs \  
         arch/c165/mach.fs \  
         arch/c165/prim.fs \  
         arch/h8/asm.fs \  
         arch/shboom/asm.fs \          arch/shboom/asm.fs \
         arch/shboom/compiler.fs \          arch/shboom/compiler.fs \
         arch/shboom/dis.fs \          arch/shboom/dis.fs \
Line 317  ARCHS = \ Line 340  ARCHS = \
         arch/sharc/mach.fs \          arch/sharc/mach.fs \
         arch/sharc/machine.h \          arch/sharc/machine.h \
         arch/sharc/compile.sharc \          arch/sharc/compile.sharc \
         arch/sharc/unistd.h \  
         arch/sharc/systypes.h \          arch/sharc/systypes.h \
         arch/sharc/types.h \          arch/sharc/types.h \
         arch/sharc/g21k-3.3.4-bp1.diff          arch/sharc/g21k-3.3.4-bp1.diff \
           arch/r8c/asm.fs \
           arch/r8c/asm-test.fs \
           arch/r8c/prim.fs \
           arch/r8c/errors.fs \
           arch/r8c/tt.fs \
           arch/r8c/tasker.fs \
           arch/r8c/lauflicht.fs \
           arch/r8c/terminal.fs \
           arch/r8c/mach.fs
   
   #not included in distribution until distribution terms are included:
   ARCHS_NO_DIST = \
           arch/6502/asm.fs \
           arch/6502/cold.fs \
           arch/6502/softuart.fs \
           arch/6502/zero.fs \
           arch/8086/asm.fs \
           arch/8086/mach.fs \
           arch/8086/mach.sh \
           arch/8086/prim.fs \
           arch/avr/asm.fs \
           arch/c165/asm.fs \
           arch/c165/mach.fs \
           arch/c165/prim.fs \
           arch/h8/asm.fs \
           arch/sharc/unistd.h
   
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
         vmgen-ex/engine.c vmgen-ex/fib.mini \          vmgen-ex/engine.c vmgen-ex/fib.mini \
Line 333  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil Line 381  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil
 VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%)  VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-ex2/%)
   
 SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \  SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \
         gforthmi.in vmgen.in README.vmgen NEWS.vmgen \          gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \
         configure.in configure config.sub config.guess elisp-comp missing \          configure.in configure config.sub config.guess elisp-comp missing \
         engine/config.h.in stamp-h.in \          engine/config.h.in stamp-h.in envos.fs.in \
         iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \          iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
         BUILD-FROM-SCRATCH model \          BUILD-FROM-SCRATCH model \
         COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \          COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
         doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \          doc/gforth.ds doc/gforth.1 doc/version.texi.in \
         doc/vmgen.texi doc/fdl.texi doc/gpl.texi \          doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
         gforth.el \          gforth.el \
         prim peeprules.vmg engine/engine.c engine/main.c \          prim cache0.vmg cache1.vmg peeprules.vmg \
         engine/io.c engine/support.c engine/signals.c \          engine/engine.c engine/main.c \
           engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \
         $(ARCHS) \          $(ARCHS) \
         engine/profile.c \          engine/profile.c \
         engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.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/ecvt.c engine/memcmp.c engine/rint.c \
           engine/strtol.c engine/strtoul.c \
         engine/ansidecl.h engine/memmove.c \          engine/ansidecl.h engine/memmove.c \
         engine/pow10.c engine/atanh.c engine/cleanalign.c \          engine/pow10.c engine/atanh.c engine/cleanalign.c \
         engine/strerror.c engine/strsignal.c engine/dblsub.c \          engine/strerror.c engine/strsignal.c engine/dblsub.c \
Line 359  SOURCES = $(CVSDIRS) compat Makefile.in Line 409  SOURCES = $(CVSDIRS) compat Makefile.in
         gforthmi.cmd glosgen.glo doc/glossaries.doc \          gforthmi.cmd glosgen.glo doc/glossaries.doc \
         $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \          $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
         timings.sc \          timings.sc \
         test/coretest.out test/checkans.out          test/coretest.out test/checkans.out test/gforth.out \
           cache-fast*.vmg
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) #gforth-prof$(EXE) #gforth-native$(EXE)  ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES)
   
   ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE) 
   
 GEN = $(ENGINES) kernel/version.fs  GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc
   
 # things that need a working forth system to be generated  # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \  FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
         engine/prim_superend.i engine/profile.i \          engine/prim_superend.i engine/profile.i \
         engine/prim_num.i engine/prim_grp.i \          engine/prim_num.i engine/prim_grp.i \
         engine/costs.i engine/super2.i          engine/costs.i engine/super2.i
   FORTH_GEN_ENGINE_FAST= \
           engine/prim-fast.i engine/prim_lab-fast.i engine/prim_names-fast.i \
           engine/prim_superend-fast.i engine/profile-fast.i \
           engine/prim_num-fast.i engine/prim_grp-fast.i \
           engine/costs-fast.i engine/super2-fast.i
 FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs  FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs
 FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB)  FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB)
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,  # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@   FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec
   
 #kernel dependencies  #kernel dependencies
 KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs  KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs gforth$(EXE)
   
 #distributed documentation  #distributed documentation
 DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \  DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \
           doc/vmgen.info doc/vmgen.info-* doc/vmgen.ps            doc/vmgen.info doc/vmgen.ps
   
 KERNLS = kernl16b.fi- kernl16l.fi- \  KERNLS = kernl16b$(EC).fi- kernl16l$(EC).fi- \
          kernl32b.fi- kernl32l.fi- \           kernl32b$(EC).fi- kernl32l$(EC).fi- \
          kernl64b.fi- kernl64l.fi-           kernl64b$(EC).fi- kernl64l$(EC).fi-
   
 GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
         doc/gforth.texi doc/gforth.dvi doc/gforth.ps \          doc/gforth.texi doc/gforth.dvi doc/gforth.ps \
Line 414  version: Makefile.in configure.in Line 472  version: Makefile.in configure.in
 # shell und file utilities.  # shell und file utilities.
   
 kernel/version.fs:      version  kernel/version.fs:      version
         $(MAKE) gforth$(EXE)  
         echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   engines $(FORTH_GEN) $(GEN)  more:   engines $(FORTH_GEN) $(GEN)
           @make check
           @$(FORTH_FAST) --diag -e bye
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 450  docclean: FORCE Line 509  docclean: FORCE
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \                  -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
                 engine/gforth$(EXE) engine/gforth-fast$(EXE) \                  engine/gforth$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \
                 engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \                  engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \
                 engine/gforth-ditc$(EXE) #engine/gforth-prof$(EXE)                  engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) \
                   engine/prim-s.i
   
 distclean:      clean  distclean:      clean
                 -$(RM) -rf config.cache config.log config.status \                  -$(RM) -rf config.cache config.log config.status \
                 engine/config.h Makefile Makedist engine/Makefile \                  engine/config.h Makefile Makedist engine/Makefile \
                 stamp-h engine/stamp-h \                  stamp-h engine/stamp-h \
                 doc/version.texi gforthmi vmgen                  doc/version.texi gforthmi vmgen \
                   prim-fast.b $(FORTH_GEN_ENGINE_FAST)
   
 #realclean is useless, but dangerous, so it's commented out  #realclean is useless, but dangerous, so it's commented out
 realclean:      distclean  realclean:      distclean
Line 473  virtualclean: mostlyclean Line 534  virtualclean: mostlyclean
 #Makefile if it contains our dist rules.  Therefore we have put these  #Makefile if it contains our dist rules.  Therefore we have put these
 #rules in Makedist (you can use them with GNU make on these systems).  #rules in Makedist (you can use them with GNU make on these systems).
   
 dist:           Makedist machpc.fs FORCE  dist:           Makedist FORCE
                 -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs  
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
                 -$(RM) machpc.fs  
   
 dosdist:        Makedist machpc.fs FORCE  dosdist:        Makedist FORCE
                 -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs  
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
                 -$(RM) machpc.fs  
   
 srcdist:        Makedist FORCE  srcdist:        Makedist FORCE
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
Line 495  docdist: Makedist FORCE Line 552  docdist: Makedist FORCE
 htmldist:       Makedist FORCE  htmldist:       Makedist FORCE
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
   
 bindist:        Makedist machpc.fs FORCE  bindist:        Makedist FORCE
                 -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs  
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
                 -$(RM) machpc.fs  
   
 binonlydist:    Makedist machpc.fs FORCE  binonlydist:    Makedist FORCE
                 -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs  
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
                 -$(RM) machpc.fs  
   
 #HPUX make breaks the cycle differently when the dates are equal, so  #HPUX make breaks the cycle differently when the dates are equal, so
 # touch some of the files if it acts up  # touch some of the files if it acts up
Line 518  hpux-workaround: Line 571  hpux-workaround:
 #hard to generate).  #hard to generate).
 #we rebuild gforth.fi, because it contains some path names.  #we rebuild gforth.fi, because it contains some path names.
 #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.  #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.
 install:        gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs  install:        gforth$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs
                 touch $(siteforthdir)/siteinit.fs                  $(NORMAL_INSTALL)
                 -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen                  touch $(DESTDIR)$(siteforthdir)/siteinit.fs
                 -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)                  -$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi #$(DESTDIR)$(bindir)/vmgen
                 -$(RM) $(bindir)/gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE)                  -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)
                 $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)                  -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE)
                 (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE))                  $(INSTALL_PROGRAM) gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE)
                 $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)                  -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE)
                 (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))                  (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EC)$(EXE) gforth$(EC)$(EXE))
                 $(INSTALL_PROGRAM) -s gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE)                  $(INSTALL_PROGRAM) gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)
                 (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE))                  -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)
                 $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)                  (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EC)$(EXE) gforth-fast$(EC)$(EXE))
                 $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION)                  $(INSTALL_PROGRAM) gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE)
                 $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)                  (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EC)$(EXE) gforth-itc$(EC)$(EXE))
                 (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)                  $(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION)
                 (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)                  #$(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION)
                 -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)                  $(INSTALL_PROGRAM) gforth-ditc $(DESTDIR)$(libdir)/gforth/$(VERSION)
                 -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done                  (cd $(DESTDIR)$(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
                   #(cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)
                   -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(DESTDIR)$(man1dir)
                   #-for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done
                   -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done
                 for i in $(FORTH_SRC) $(COMPAT) prim; do \                  for i in $(FORTH_SRC) $(COMPAT) prim; do \
                         $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \                          $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \
                 done                  done
                 $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)                  $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
                 @if test -d "$(emacssitelispdir)"; then \                  @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
                         $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \                          $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \
                 else \                  else \
                         echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \                          echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \
                 fi                  fi
                 -$(RM) gforth.fi                  -$(RM) gforth.fi
                 GFORTHD="./gforth-ditc -p $(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)                  GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
                 $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) gforth.fi install.TAGS                  $(RM) gforth.fi install.TAGS
                 $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info                  $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)
                 $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info                  $(POST_INSTALL)
                   $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info
                   #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info
   
 install-strip:  install  install-strip:  install
   
 installdirs:    mkinstalldirs  installdirs:    mkinstalldirs
                 for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \                  $(NORMAL_INSTALL)
                         $(srcdir)/mkinstalldirs $$i; \                  for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION); do \
                           $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
                 done                  done
                 for i in $(CVSDIRS); do \                  for i in $(CVSDIRS); do \
                         $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \                          $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/`dirname $$i`; \
                 done                  done
                 $(RM) -rf $(datadir)/gforth/$(VERSION)/engine                  $(RM) -rf $(DESTDIR)$(datadir)/gforth/$(VERSION)/engine
   
 #deinstall all files specific to this version of gforth  #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'  #to uninstall version foo, type `make uninstall VERSION=foo'
 uninstall:      FORCE  uninstall:      FORCE
                 -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION)                  $(NORMAL_UNINSTALL)
                 @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-itc$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth"                  -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION)
                   @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth"
   
 check:          gforths gforth.fi  check:          gforths gforth.fi
                 $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-ditc" >/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 ENGINE="./gforth" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
   
 checkone test:  gforth$(EXE) gforth.fi  checkone test:  gforth$(EC)$(EXE) 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/gforth.fs -e bye | 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 -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 $(FORTHS) test/signals.fs -e bye                  $(FORTHS) test/signals.fs -e bye
                   $(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
                 $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out                  $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
                 $(FORTH) prims2x.fs -e \                  $(FORTH) prims2x.fs -e \
                   "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \                    "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
                   tr -d '\015' | diff -c - $(srcdir)/engine/prim.i                    tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i
   
 bench:          gforth-fast$(EXE) gforth.fi  check-nofast: gforth$(EC)$(EXE) gforth.fi
                   $(FORTHS) test/gforth-nofast.fs -e bye
   
   test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
                   $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
   
   primtest:       gforth gforth-native test/primtest.fi FORCE
                   (echo rs|ENVVAR=bla ./gforth -i test/primtest.fi) && (echo rs|ENVVAR=bla ./gforth-native -i test/primtest.fi); echo $$?
   
   bench:          gforth-fast$(EC)$(EXE) gforth.fi
                 @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'                  @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
                 time $(FORTH_FAST) siev.fs -e "main bye"                  time $(FORTH_FAST) siev.fs -e "main bye"
                 time $(FORTH_FAST) bubble.fs -e "main bye"                  time $(FORTH_FAST) bubble.fs -e "main bye"
                 time $(FORTH_FAST) matrix.fs -e "main bye"                  time $(FORTH_FAST) matrix.fs -e "main bye"
                 time $(FORTH_FAST) fib.fs -e "main bye"                  time $(FORTH_FAST) fib.fs -e "main bye"
   
 onebench:  onebench one-bench:
                 @\time -f "siev   %U" $(FORTH_FAST) siev.fs -e "main bye"          $(FORTH_FAST) onebench.fs
                 @\time -f "bubble %U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye"  
                 @\time -f "matrix %U" $(FORTH_FAST) matrix.fs -e "main bye"  all-bench allbench:     gforth-fast$(EC)$(EXE) gforth$(EC)$(EXE) gforth-itc$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth.fi
                 @\time -f "fib    %U" $(FORTH_FAST) fib.fs -e "main bye"          ./gforth-fast --dynamic onebench.fs
           ./gforth-fast --no-dynamic onebench.fs
 all-bench:      gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi          ./gforth --dynamic onebench.fs
                 @echo "*** gforth-fast dynamic:"          ./gforth --no-dynamic onebench.fs
                 @$(MAKE) onebench ENGINE_FAST="./gforth-fast --dynamic"          ./gforth-itc onebench.fs
                 @echo "*** gforth-fast not dynamic:"          ./gforth-ditc onebench.fs
                 @$(MAKE) onebench ENGINE_FAST="./gforth-fast --no-dynamic"  
                 @echo "*** gforth dynamic:"  
                 @$(MAKE) onebench ENGINE_FAST="./gforth --dynamic"  
                 @echo "*** gforth not dynamic:"  
                 @$(MAKE) onebench ENGINE_FAST="./gforth --no-dynamic"  
                 @echo "*** gforth-itc:"  
                 @$(MAKE) onebench ENGINE_FAST=./gforth-itc  
                 @echo "*** gforth-ditc:"  
                 @$(MAKE) onebench ENGINE_FAST=./gforth-ditc  
   
 # ------------- Make forth images  # ------------- Make forth images
   
Line 625  all-bench: gforth-fast$(EXE) gforth$(EXE Line 687  all-bench: gforth-fast$(EXE) gforth$(EXE
 # 3. copy new kernels to kernlXYZ.fi  # 3. copy new kernels to kernlXYZ.fi
 #    these are the ones we want to use now  #    these are the ones we want to use now
   
 kernl16l.fi-:   $(KERN_DEPS) mach16l.fs  kernl16l$(EC).fi-:      $(KERN_DEPS) mach16l.fs
                 $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl16b.fi-:   $(KERN_DEPS) mach16b.fs  kernl16b$(EC).fi-:      $(KERN_DEPS) mach16b.fs
                 $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32l.fi-:   $(KERN_DEPS) mach32l.fs  kernl32l$(EC).fi-:      $(KERN_DEPS) mach32l.fs
                 $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32b.fi-:   $(KERN_DEPS) mach32b.fs  kernl32b$(EC).fi-:      $(KERN_DEPS) mach32b.fs
                 $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64l.fi-:   $(KERN_DEPS) mach64l.fs  kernl64l$(EC).fi-:      $(KERN_DEPS) mach64l.fs
                 $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64b.fi-:   $(KERN_DEPS) mach64b.fs  kernl64b$(EC).fi-:      $(KERN_DEPS) mach64b.fs
                 $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 #Solaris make does not like that:  #Solaris make does not like that:
 @GNUMAKE@kernl-%.fi:    arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  @GNUMAKE@kernl-%.fi:    arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
Line 654  kernl64b.fi-: $(KERN_DEPS) mach64b.fs Line 716  kernl64b.fi-: $(KERN_DEPS) mach64b.fs
 #SunOS make does not like that  #SunOS make does not like that
 #arch/%/mach.fs:        arch/%/prim.fs arch/%/asm.fs  #arch/%/mach.fs:        arch/%/prim.fs arch/%/asm.fs
   
 kernl16b.fi:    $(KERNLS)  kernl16b$(EC).fi:       $(KERNLS)
                 -$(CP) kernl16b.fi kernl16b.fi~                  -$(CP) kernl16b$(EC).fi kernl16b$(EC).fi~
                 -$(CP) kernl16b.fi- kernl16b.fi                  -$(CP) kernl16b$(EC).fi- kernl16b$(EC).fi
   
 kernl16l.fi:    $(KERNLS)  kernl16l$(EC).fi:       $(KERNLS)
                 -$(CP) kernl16l.fi kernl16l.fi~                  -$(CP) kernl16l$(EC).fi kernl16l$(EC).fi~
                 -$(CP) kernl16l.fi- kernl16l.fi                  -$(CP) kernl16l$(EC).fi- kernl16l$(EC).fi
   
 kernl32b.fi:    $(KERNLS)  kernl32b$(EC).fi:       $(KERNLS)
                 -$(CP) kernl32b.fi kernl32b.fi~                  -$(CP) kernl32b$(EC).fi kernl32b$(EC).fi~
                 -$(CP) kernl32b.fi- kernl32b.fi                  -$(CP) kernl32b$(EC).fi- kernl32b$(EC).fi
   
 kernl32l.fi:    $(KERNLS)  kernl32l$(EC).fi:       $(KERNLS)
                 -$(CP) kernl32l.fi kernl32l.fi~                  -$(CP) kernl32l$(EC).fi kernl32l$(EC).fi~
                 -$(CP) kernl32l.fi- kernl32l.fi                  -$(CP) kernl32l$(EC).fi- kernl32l$(EC).fi
   
 kernl64b.fi:    $(KERNLS)  kernl64b$(EC).fi:       $(KERNLS)
                 -$(CP) kernl64b.fi kernl64b.fi~                  -$(CP) kernl64b$(EC).fi kernl64b$(EC).fi~
                 -$(CP) kernl64b.fi- kernl64b.fi                  -$(CP) kernl64b$(EC).fi- kernl64b$(EC).fi
   
 kernl64l.fi:    $(KERNLS)  kernl64l$(EC).fi:       $(KERNLS)
                 -$(CP) kernl64l.fi kernl64l.fi~                  -$(CP) kernl64l$(EC).fi kernl64l$(EC).fi~
                 -$(CP) kernl64l.fi- kernl64l.fi                  -$(CP) kernl64l$(EC).fi- kernl64l$(EC).fi
   
 #kernl%.fi:     kernl%.fi- $(KERNLS)  #kernl%.fi:     kernl%.fi- $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) comp-i.fs  gforth.fi:      $(kernel_fi) gforthmi gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs
                 GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)                  GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
 prim.b:         prim peeprules.vmg  prim.b:         prim cache0.vmg
                 m4 -s $(srcdir)/prim >$@                  $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@
                 sleep 1 #should make hpux-workaround unnecessary                  sleep 1 #should make hpux-workaround unnecessary
   
 engine/prim.i:          prim.b prims2x.fs  prim-fast.b:    prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" save-mem out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-                  $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@
                 $(CP) $@- $@                  sleep 1 #should make hpux-workaround unnecessary
                 $(RM) $@-  
   
 engine/prim_lab.i:      prim.b prims2x.fs  
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label dup process-file bye" >$@-  
                 $(CP) $@- $@  
                 $(RM) $@-  
   
 engine/prim_grp.i:      prim.b prims2x.fs  
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop dup process-file bye" >$@-  
                 $(CP) $@- $@  
                 $(RM) $@-  
   
 engine/prim_names.i:    prim.b prims2x.fs  
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-forthname dup process-file bye" >$@-  
                 $(CP) $@- $@  
                 $(RM) $@-  
   
 engine/prim_superend.i: prim.b prims2x.fs  
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@-  
                 $(CP) $@- $@  
                 $(RM) $@-  
   
 engine/peephole.i:      prim.b prims2x.fs  
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop ' output-peephole process-file bye" >$@-  
                 $(CP) $@- $@  
                 $(RM) $@-  
   
 engine/profile.i:       prim.b prims2x.fs  $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile-combined process-file bye" >$@-                  GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast
                 $(CP) $@- $@  
                 $(RM) $@-  
   
 engine/super2.i:        prim.b prims2x.fs  $(FORTH_GEN_ENGINE): prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-super2 dup process-file bye" >$@-                  GFORTH="$(FORTHP)" $(srcdir)/gfgen
                 $(CP) $@- $@  
                 $(RM) $@-  
   
 engine/costs.i: prim.b prims2x.fs  engine/prim-s.i: engine/prim.i
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs-gforth-simple ' output-costs-gforth-combined process-file bye" >$@-          grep -v '^#line ' $(srcdir)/engine/prim.i >$@
                 $(CP) $@- $@  
                 $(RM) $@-  
   
 kernel/aliases.fs:      prim.b prims2x.fs kernel/aliases0.fs  kernel/aliases.fs:      prim.b prims2x.fs kernel/aliases0.fs
                 $(CP) kernel/aliases0.fs $@-                  $(CP) kernel/aliases0.fs $@-
Line 748  kernel/prim.fs: prim.b prims2x.fs kernel Line 778  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 engine/prim_num.i:      prim.b prims2x.fs  gforth$(EC)$(EXE):              engines
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c-prim-num ' noop process-file bye" >$@                  -$(CP) gforth$(EC)$(EXE) gforth~
   
 gforth$(EXE):           engines  
                 -$(CP) gforth$(EXE) gforth~  
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                   -$(MASSAGE_EXE) $@
                 @GFORTH_EXE@                  @GFORTH_EXE@
   
 gforth-fast$(EXE):      engines  gforth-fast$(EC)$(EXE): engines-fast
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                   -$(MASSAGE_EXE) $@
                 @GFORTHFAST_EXE@                  @GFORTHFAST_EXE@
   
 gforth-native$(EXE):    engines  gforth-native$(EC)$(EXE):       engines-fast
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                   -$(MASSAGE_EXE) $@
 #@GFORTHX_EXE@  #@GFORTHX_EXE@
   
 gforth-itc$(EXE):       engines  gforth-itc$(EC)$(EXE):  engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHITC_EXE@                  @GFORTHITC_EXE@
   
 gforth-ditc$(EXE):      engines  gforth-ditc$(EC)$(EXE): engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 gforth-prof$(EXE):      engines  gforth-prof$(EC)$(EXE): engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
   
 gforths: $(ENGINES)  gforths: $(ENGINES) $(ENGINES_FAST)
   
 engines:        FORCE $(FORTH_GEN_ENGINE) engine/Makefile  engines:        FORCE $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 cd engine && $(MAKE) $(ENGINES)                  cd engine && $(MAKE) $(ENGINES)
   
   engines-fast:   FORCE $(FORTH_GEN_ENGINE_FAST) engine/Makefile engine/config.h
                   cd engine && $(MAKE) $(ENGINES_FAST)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
 %.c:            %.pri prim2cl.fs  %.c:            %.pri prim2cl.fs
Line 800  tags:  gforth.tags Line 833  tags:  gforth.tags
 install.TAGS:   gforth.TAGS  install.TAGS:   gforth.TAGS
                 sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS                  sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS
   
 gforth.TAGS:    @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS  gforth.TAGS:    @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
                 $(FORTHK) etags.fs except.fs startup.fs -e bye                  $(FORTHK) etags.fs except.fs startup.fs -e bye
                 cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS                  cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS
                 rm TAGS                  rm TAGS
   
 gforth.tags:    @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags  gforth.tags:    @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags
                 $(FORTHK) tags.fs except.fs startup.fs -e bye                  $(FORTHK) tags.fs except.fs startup.fs -e bye
                 cat tags prim.tags kernel.tags >gforth.tags                  cat tags prim.tags kernel.tags >gforth.tags
                 rm tags                  rm tags
Line 827  prim.tags:  prim.b prims2x.fs Line 860  prim.tags:  prim.b prims2x.fs
                 $(RM) $@-                  $(RM) $@-
   
 kernel.TAGS:  kernel.TAGS:
                 rm kernl16l.fi-; $(MAKE) @kernel_fi@                  rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
   
 kernel.tags:  kernel.tags:
                 rm kernl16l.fi-; $(MAKE) @kernel_fi@                  rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
   
   #elc files
   gforth.elc:     gforth.el
                   emacs -batch -f batch-byte-compile $<
   
   #Documentation
   
 doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs  doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs
                 $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye                  $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye
Line 847  doc/gforth.texi: doc/gforth.ds prim.b ds Line 886  doc/gforth.texi: doc/gforth.ds prim.b ds
 checkdoc:       doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi  checkdoc:       doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi
                 $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye                  $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
                 -grep unknown doc/gforth.texi                  -grep unknown doc/gforth.texi
                   -grep doc- doc/gforth.texi
   
 dvi:            doc/gforth.dvi doc/vmgen.dvi  dvi:            doc/gforth.dvi doc/vmgen.dvi
   
Line 912  stamp-h.in: configure.in aclocal.m4 Line 952  stamp-h.in: configure.in aclocal.m4
         echo timestamp > $(srcdir)/stamp-h.in          echo timestamp > $(srcdir)/stamp-h.in
   
 engine/config.h: stamp-h  engine/config.h: stamp-h
 stamp-h: engine/config.h.in config.status  stamp-h: engine/config.h.in config.status stamp-h.in
         ./config.status          ./config.status
   
 Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi:     Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in  Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec:  Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in
         ./config.status          ./config.status
   
 config.status: configure  config.status: configure
         ./config.status --recheck          ./config.status --recheck
   
   
 #create files for DOS, because DOS cannot do it itself  #create files for DOS, because DOS cannot do it itself
 makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in  makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in
         sed -f mkdosmf.sed <Makefile.in >makefile.dos          sed -f mkdosmf.sed <Makefile.in >makefile.dos

Removed from v.1.279  
changed lines
  Added in v.1.363


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>