Diff for /gforth/Makefile.in between versions 1.213 and 1.263

version 1.213, 2001/12/29 20:40:48 version 1.263, 2003/03/09 17:16:38
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 30 Line 30
   
 # ------------- gforth version  # ------------- gforth version
   
 VERSION = @VERSION@  VERSION = @PACKAGE_VERSION@
 DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'`  DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'`
   
 # ------------- System specific variables         # ------------- System specific variables       
   
 machine=@machine@  machine=@machine@
 kernel_fi=@kernel_fi@  kernel_fi=@kernel_fi@
 EXE=@EXE@  EXE=@EXEEXT@
   
 # this is the type of machine  # this is the type of machine
 # used to extend the include path with ./arch/$machine  # used to extend the include path with ./arch/$machine
Line 59  TAR = tar cf - Line 59  TAR = tar cf -
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@  INSTALL_DATA = @INSTALL_DATA@
   INSTALL_INFO = @INSTALL_INFO@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 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)
 FORTHSIZES = @FORTHSIZES@  FORTHSIZES = @FORTHSIZES@
 FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)  FORTHS_ARGS =  -p $(FORTHPATH)$(PATHSEP)$(srcdir)
   FORTH_ARGS = --die-on-signal $(FORTHS_ARGS)
 ENGINE = ./gforth  ENGINE = ./gforth
 FORTH   = $(ENGINE) $(FORTH_ARGS)  FORTH   = $(ENGINE) $(FORTH_ARGS)
   FORTHS  = $(ENGINE) $(FORTHS_ARGS)
 # the (existing) forth system to use for cross compiling and primitives tables  # the (existing) forth system to use for cross compiling and primitives tables
 # per default we use the one in this directory for a rebuild. It is also  # per default we use the one in this directory for a rebuild. It is also
 # 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 -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 'fpath= .|~+|$(srcdir)'  FORTHB = $(BUILDFORTH) -e 3 exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs  # the Forth system for running prims2x.fs
 FORTHP = $(FORTHB)  FORTHP = $(FORTH)
 ENGINE_FAST = $(ENGINE)-fast  ENGINE_FAST = $(ENGINE)-fast
 FORTH_FAST      = $(ENGINE_FAST) $(FORTH_ARGS)  FORTH_FAST      = $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)  FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
Line 168  KERN_SRC = \ Line 171  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/groups.fs
   
 EC_SRC = \  EC_SRC = \
         asm/README \          asm/README \
Line 190  GFORTH_FI_SRC = \ Line 194  GFORTH_FI_SRC = \
         blocked.fb \          blocked.fb \
         blocks.fs \          blocks.fs \
         bufio.fs \          bufio.fs \
           code.fs \
         debug.fs \          debug.fs \
         debugs.fs \          debugs.fs \
         ekey.fs \          ekey.fs \
Line 206  GFORTH_FI_SRC = \ Line 211  GFORTH_FI_SRC = \
         intcomp.fs \          intcomp.fs \
         locals.fs \          locals.fs \
         look.fs \          look.fs \
           quotes.fs \
         search.fs \          search.fs \
         see.fs \          see.fs \
         see-ext.fs \          see-ext.fs \
Line 225  GFORTH_FI_SRC = \ Line 231  GFORTH_FI_SRC = \
   
 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 \
         code.fs colorize.fs comp-i.fs \          colorize.fs comp-i.fs \
         doskey.fs ds2texi.fs \          doskey.fs ds2texi.fs \
         envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \          envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
         glosgen.fs gray.fs httpd.fs proxy.fs \          glosgen.fs gray.fs httpd.fs proxy.fs \
         make-app.fs doc/makedoc.fs \          make-app.fs doc/makedoc.fs \
         more.fs other.fs prims2x.fs random.fs \          locate.fs more.fs other.fs prims2x.fs random.fs \
         table.fs string.fs \          sokoban.fs string.fs table.fs tags.fs \
         tt.fs sokoban.fs \          tt.fs \
         unbuffer.fs wordsets.fs \          unbuffer.fs wordsets.fs \
         test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \          test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
         test/string.fs test/other.fs test/checkans.fs \          test/string.fs test/float.fs test/gforth.fs \
           test/other.fs test/signals.fs test/checkans.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 \
Line 249  COMPAT = compat/README \ Line 256  COMPAT = compat/README \
         compat/exception.fs \          compat/exception.fs \
         compat/loops.fs \          compat/loops.fs \
         compat/required.fs \          compat/required.fs \
           compat/strcomp.fs \
         compat/struct.fs \          compat/struct.fs \
         compat/vocabulary.fs          compat/vocabulary.fs
   
 GFORTH_TEXI =  doc/gforth.texi doc/version.texi  GFORTH_TEXI =  doc/gforth.texi doc/version.texi
   
   VMGEN_TEXI = doc/vmgen.texi doc/version.texi doc/fdl.texi
   
 ALLSUBDIRS = engine  ALLSUBDIRS = engine
   
 ARCHS = \  ARCHS = \
Line 266  ARCHS = \ Line 276  ARCHS = \
         arch/sparc/machine.h \          arch/sparc/machine.h \
         arch/power/machine.h \          arch/power/machine.h \
         arch/power/_sync_cache_range.c \          arch/power/_sync_cache_range.c \
         arch/power/elf32ppc.x \  
         arch/alpha/machine.h \          arch/alpha/machine.h \
         arch/ia64/machine.h \          arch/ia64/machine.h \
         arch/4stack/README \          arch/4stack/README \
Line 321  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil Line 330  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefil
         vmgen-ex/simple.mini vmgen-ex/stat.awk vmgen-ex/support.c \          vmgen-ex/simple.mini vmgen-ex/stat.awk vmgen-ex/support.c \
         vmgen-ex/test.mini vmgen-ex/test.out          vmgen-ex/test.mini vmgen-ex/test.out
   
   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 \          gforthmi.in vmgen.in README.vmgen NEWS.vmgen \
         configure.in configure config.sub config.guess elisp-comp missing \          configure.in configure config.sub config.guess elisp-comp missing \
         acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \          engine/config.h.in stamp-h.in \
         iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \          iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
         COPYING AUTHORS ChangeLog Benchres aclocal.m4 \          BUILD-FROM-SCRATCH model \
           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/texinfo.tex doc/gforth.1 doc/version.texi.in \
           doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
         gforth.el \          gforth.el \
         prim peeprules.vmg engine/engine.c engine/main.c \          prim peeprules.vmg engine/engine.c engine/main.c \
         engine/io.c engine/memcmpc.c engine/signals.c $(ARCHS) \          engine/io.c engine/support.c engine/signals.c \
         engine/peephole.c engine/profile.c \          $(ARCHS) \
           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/strtol.c engine/strtoul.c \
         engine/ansidecl.h engine/memmove.c \          engine/ansidecl.h engine/memmove.c \
Line 343  SOURCES = $(CVSDIRS) compat Makefile.in Line 357  SOURCES = $(CVSDIRS) compat Makefile.in
         versions.bsh \          versions.bsh \
         configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \          configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \
         gforthmi.cmd glosgen.glo doc/glossaries.doc \          gforthmi.cmd glosgen.glo doc/glossaries.doc \
         $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) \          $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
         timings.sc \          timings.sc \
         test/coretest.out test/checkans.out          test/coretest.out test/checkans.out
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-prof$(EXE) kernel/version.fs  GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) kernel/version.fs
   #gforth-native$(EXE) gforth-prof$(EXE)
   
 # things that need a working forth system to be generated  # things that need a working forth system to be generated
 FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i engine/prim_superend.i engine/peephole.i engine/profile.i kernel/aliases.fs kernel/prim.fs  FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
           engine/prim_superend.i engine/profile.i \
           engine/prim_num.i engine/prim_grp.i
   FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.fs
 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@ 
   
   #kernel dependencies
   KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs
   
 #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
   
 KERNLS = kernl16b.fi- kernl16l.fi- \  KERNLS = kernl16b.fi- kernl16l.fi- \
          kernl32b.fi- kernl32l.fi- \           kernl32b.fi- kernl32l.fi- \
          kernl64b.fi- kernl64l.fi-           kernl64b.fi- kernl64l.fi-
   
 GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile Makedist engine/Makefile configure  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
           doc/gforth.texi doc/gforth.dvi doc/gforth.ps \
           doc/vmgen.dvi doc/vmgen.ps \
           Makefile Makedist engine/Makefile configure
   
 #standards.info recommends this:  #standards.info recommends this:
 .SUFFIXES:  .SUFFIXES:
Line 389  kernel/version.fs: version Line 414  kernel/version.fs: version
         $(MAKE) gforth$(EXE)          $(MAKE) gforth$(EXE)
         echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   engine $(FORTH_GEN) $(GEN)  more:   engines $(FORTH_GEN) $(GEN)
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 422  docclean: FORCE Line 447  docclean: FORCE
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) engine/gforth$(EXE) \                  -$(RM) -rf $(GEN) engine/gforth$(EXE) \
                 engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \                  engine/gforth-fast$(EXE) engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \
                   engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \
                 *.o engine/*.o arch/*/*.o version                  *.o engine/*.o arch/*/*.o version
   
 distclean:      clean  distclean:      clean
Line 480  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 506  install: gforth$(EXE) $(FORTH_SRC) $(ker
                 touch $(siteforthdir)/siteinit.fs                  touch $(siteforthdir)/siteinit.fs
                 -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen                  -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen
                 -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)                  -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
                   -$(RM) $(bindir)/gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE)
                 $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)                  $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
                 (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE))                  (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE))
                 $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)                  $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
                 (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))                  (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))
                   $(INSTALL_PROGRAM) -s gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE)
                   (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE))
                 $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)                  $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
                 $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION)                  $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION)
                 $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)                  $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)
                 (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)                  (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
                 (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)                  (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)
                 -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)                  -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
                 -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done                  -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(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 $(datadir)/gforth/$(VERSION)/$$i; \
                 done                  done
Line 505  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 534  install: gforth$(EXE) $(FORTH_SRC) $(ker
                 $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) gforth.fi install.TAGS                  $(RM) gforth.fi install.TAGS
                 @echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \                  $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info
                 echo "* Gforth: (gforth).       A fast interpreter for the Forth language."                  $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info
   
 install-strip:  install  install-strip:  install
   
Line 522  installdirs: mkinstalldirs Line 551  installdirs: mkinstalldirs
 #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)/gforthmi-$(VERSION) (bindir)/vmgen-$(VERSION)                  -$(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)
                 @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"                  @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"
   
   check:          gforths gforth.fi
                   $(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 ***"
   
 check test:     gforth$(EXE) gforth.fi  checkone test:  gforth$(EXE) gforth.fi
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs -e bye | 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/gforth.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out                  $(FORTHS) test/signals.fs -e bye
                   $(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\" $(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"| \
                   diff -c - $(srcdir)/engine/prim.i                    tr -d '\015' | diff -c - $(srcdir)/engine/prim.i
   
 bench:          gforth-fast$(EXE) gforth.fi  bench:          gforth-fast$(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)'
Line 540  bench:  gforth-fast$(EXE) gforth.fi Line 579  bench:  gforth-fast$(EXE) gforth.fi
                 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:
                   @\time -f "siev   %U" $(FORTH_FAST) siev.fs -e "main bye"
                   @\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"
                   @\time -f "fib    %U" $(FORTH_FAST) fib.fs -e "main bye"
   
   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"
                   @echo "*** gforth-fast not dynamic:"
                   @$(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
   
 # How to make new images:  # How to make new images:
Line 550  bench:  gforth-fast$(EXE) gforth.fi Line 609  bench:  gforth-fast$(EXE) gforth.fi
 # 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_SRC) kernel/version.fs mach16l.fs machpc.fs $(FORTH_GEN0)  kernl16l.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.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl16b.fi-:   $(KERN_SRC) kernel/version.fs mach16b.fs machpc.fs $(FORTH_GEN0)  kernl16b.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.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32l.fi-:   $(KERN_SRC) kernel/version.fs mach32l.fs machpc.fs $(FORTH_GEN0)  kernl32l.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.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32b.fi-:   $(KERN_SRC) kernel/version.fs mach32b.fs machpc.fs $(FORTH_GEN0)  kernl32b.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.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64l.fi-:   $(KERN_SRC) kernel/version.fs mach64l.fs machpc.fs $(FORTH_GEN0)  kernl64l.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.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64b.fi-:   $(KERN_SRC) kernel/version.fs mach64b.fs machpc.fs $(FORTH_GEN0)  kernl64b.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.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl-%.fi:     arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  #Solaris make does not like that:
                 $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"  #kernl-%.fi:    arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 if [ -f `echo $< | sed s/fs/sh/` ]; \  #               $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
                 then sh `echo $< | sed s/fs/sh/` $@; \  #               if [ -f `echo $< | sed s/fs/sh/` ]; \
                 else $(CP) $@- $@; \  #               then sh `echo $< | sed s/fs/sh/` $@; \
                 fi  #               else $(CP) $@- $@; \
   #               fi
   
 #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
Line 606  kernl64l.fi: $(KERNLS) Line 666  kernl64l.fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC)  gforth.fi:      $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(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)" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
Line 615  prim.b:  prim peeprules.vmg Line 675  prim.b:  prim peeprules.vmg
                 m4 -s $(srcdir)/prim >$@                   m4 -s $(srcdir)/prim >$@ 
   
 engine/prim.i:          prim.b prims2x.fs  engine/prim.i:          prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-                  $(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" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 624  engine/prim_lab.i: prim.b prims2x.fs Line 684  engine/prim_lab.i: prim.b prims2x.fs
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(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  engine/prim_superend.i: prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
Line 635  engine/peephole.i: prim.b prims2x.fs Line 705  engine/peephole.i: prim.b prims2x.fs
                 $(RM) $@-                  $(RM) $@-
   
 engine/profile.i:       prim.b prims2x.fs  engine/profile.i:       prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile-combined process-file bye" >$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
   engine/costs.i: prim.b prims2x.fs
                   $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 651  kernel/prim.fs: prim.b prims2x.fs kernel Line 726  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 kernel/peephole.fs:     prim.b prims2x.fs  kernel/groups.fs:       engine/prim_grp.i
                 $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' noop ' output-forth-peephole process-file bye" >$@-          grep GROUP engine/prim_grp.i | cut -f2 -d, | sed -e 's/)/ ,/g' >$@
                 $(CP) $@- $@  
                 $(RM) $@-  engine/prim_num.i:      prim.b prims2x.fs
                   $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c-prim-num ' noop process-file bye" >$@
   
 gforth$(EXE):           engines  gforth$(EXE):           engines
                 -$(CP) gforth$(EXE) gforth~                  -$(CP) gforth$(EXE) gforth~
Line 665  gforth-fast$(EXE): engines Line 741  gforth-fast$(EXE): engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHFAST_EXE@                  @GFORTHFAST_EXE@
   
   gforth-native$(EXE):    engines
                   $(CP) engine/$@ $@
   #@GFORTHX_EXE@
   
   gforth-itc$(EXE):       engines
                   $(CP) engine/$@ $@
                   @GFORTHITC_EXE@
   
 gforth-ditc$(EXE):      engines  gforth-ditc$(EXE):      engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
Line 672  gforth-ditc$(EXE): engines Line 756  gforth-ditc$(EXE): engines
 gforth-prof$(EXE):      engines  gforth-prof$(EXE):      engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
   
 engines:        FORCE engine/Makefile engine/prim.i engine/prim_lab.i engine/peephole.i engine/profile.i  gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE)
                 cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)  
   engines:        FORCE $(FORTH_GEN_ENGINE) engine/Makefile
                   cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
Line 743  checkdoc: doc/gforth.ds prim.b ds2texi.f Line 829  checkdoc: doc/gforth.ds prim.b ds2texi.f
                 $(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
   
 dvi:            doc/gforth.dvi  dvi:            doc/gforth.dvi doc/vmgen.dvi
   
 doc/gforth.dvi doc/gforth.fns:  $(GFORTH_TEXI)  doc/gforth.dvi doc/gforth.fns:  $(GFORTH_TEXI)
                 cd doc; $(TEXI2DVI) gforth.texi                  cd doc; $(TEXI2DVI) gforth.texi
   
   doc/vmgen.dvi:  $(VMGEN_TEXI)
                   cd doc; $(TEXI2DVI) vmgen.texi
   
 doc/gforth.ps:  doc/gforth.dvi  doc/gforth.ps:  doc/gforth.dvi
                 $(DVI2PS) doc/gforth.dvi -o $@                  $(DVI2PS) doc/gforth.dvi -o $@
   
 info:           doc/gforth.info  doc/vmgen.ps:   doc/vmgen.dvi
                   $(DVI2PS) doc/vmgen.dvi -o $@
   
   info:           doc/gforth.info doc/vmgen.info
   
   doc/gforth.info: $(GFORTH_TEXI)
                   cd doc; $(MAKEINFO) gforth.texi
   
 doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)  doc/vmgen.info: $(VMGEN_TEXI)
                 -cd doc; $(MAKEINFO) gforth.texi                  cd doc; $(MAKEINFO) vmgen.texi
   
 ### need makeinfo 4.0 to generate html. Otherwise, use texi2html..  
 html:           $(GFORTH_TEXI)  ### need makeinfo 4.2 to generate html with these rules
                 -$(RMTREE) html  doc/gforth: $(GFORTH_TEXI)
                 -mkdir html          cd doc; $(MAKEINFO) --html gforth.texi
                 cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi  
 ###             cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi  doc/vmgen: $(VMGEN_TEXI)
           cd doc; $(MAKEINFO) --html vmgen.texi
   
 doc/gforth.txt: $(GFORTH_TEXI)  doc/gforth.txt: $(GFORTH_TEXI)
                 -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt                  -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt
   
 doc:            info html doc/gforth.ps doc/gforth.txt TAGS  doc/vmgen.txt:  $(VMGEN_TEXI)
                   -cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt
   
   doc:            info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS
   
 # For an explanation of the following Makefile rules, see node  # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.  # `Automatic Remaking' in GNU Autoconf documentation.
   
 #Note: no target "$(srcdir)/configure", because that does not trigger   #Note: no target "$(srcdir)/configure", because that does not trigger 
 #unless $(srcdir)!="."  #unless $(srcdir)!="."
 configure:      configure.in aclocal.m4  configure: configure.in aclocal.m4
                 cd $(srcdir) && autoconf          cd $(srcdir) && autoconf
   
 aclocal.m4:     acinclude.m4 configure.in  aclocal.m4:     configure.in
                 aclocal                  aclocal
   
 # autoheader might not change config.h.in, so touch a stamp file.  # autoheader might not change config.h.in, so touch a stamp file.
 engine/config.h.in:     stamp-h.in  engine/config.h.in: stamp-h.in
 stamp-h.in:     configure.in  acconfig.h  stamp-h.in: configure.in aclocal.m4
                 cd $(srcdir) && autoheader          cd $(srcdir) && autoheader
                 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
                 CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status          ./config.status
                 echo timestamp > stamp-h  
   
 Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs:     Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in 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
                 CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./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

Removed from v.1.213  
changed lines
  Added in v.1.263


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