Diff for /gforth/Makefile.in between versions 1.362 and 1.390

version 1.362, 2007/08/17 22:00:14 version 1.390, 2008/02/26 18:02:34
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
 #Gforth is free software; you can redistribute it and/or  #Gforth is free software; you can redistribute it and/or
 #modify it under the terms of the GNU General Public License  #modify it under the terms of the GNU General Public License
 #as published by the Free Software Foundation; either version 2  #as published by the Free Software Foundation, either version 3
 #of the License, or (at your option) any later version.  #of the License, or (at your option) any later version.
   
 #This program is distributed in the hope that it will be useful,  #This program is distributed in the hope that it will be useful,
 #but WITHOUT ANY WARRANTY; without even the implied warranty of  #but WITHOUT ANY WARRANTY; without even the implied warranty of
 #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.#See the  #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #GNU General Public License for more details.  #GNU General Public License for more details.
   
 #You should have received a copy of the GNU General Public License  #You should have received a copy of the GNU General Public License
 #along with this program; if not, write to the Free Software  #along with this program. If not, see http://www.gnu.org/licenses/.
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
 # To change the values of `make' variables: instead of editing Makefiles,  # To change the values of `make' variables: instead of editing Makefiles,
 # (1) if the variable is set in `config.status', edit `config.status'  # (1) if the variable is set in `config.status', edit `config.status'
Line 67  INSTALL_INFO = @INSTALL_INFO@ Line 66  INSTALL_INFO = @INSTALL_INFO@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 M4      = @M4@  M4      = @M4@
 GCC     = @CC@  GCC     = @CC@
   PREFORTH        = @PREFORTH@ -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 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@
Line 83  BUILDFORTH = $(ENGINE) --die-on-signal - Line 83  BUILDFORTH = $(ENGINE) --die-on-signal -
 FORTHB = $(BUILDFORTH) 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 = ./gforth-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)
 FORTHK  = $(ENGINE) $(FORTHKFLAGS)  FORTHK  = $(ENGINE) $(FORTHKFLAGS)
Line 103  TEXI2HTML = texi2html Line 103  TEXI2HTML = texi2html
   
 XCFLAGS = @CFLAGS@  XCFLAGS = @CFLAGS@
 XDEFINES = @DEFS@  XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions  SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves  ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@  DEBUGFLAG = @DEBUGFLAG@
 CFLAGS  = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"'  CFLAGS  = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"'
Line 113  XLDFLAGS = @LDFLAGS@ Line 113  XLDFLAGS = @LDFLAGS@
 LDFLAGS =  $(DEBUGFLAG) $(XLDFLAGS)  LDFLAGS =  $(DEBUGFLAG) $(XLDFLAGS)
 LDLIBS  = @LIBS@  LDLIBS  = @LIBS@
   
   STACK_CACHE_REGS = @STACK_CACHE_REGS@
 STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@  STACK_CACHE_DEFAULT_FAST = @STACK_CACHE_DEFAULT_FAST@
   
 # ------------  Install Directories  # ------------  Install Directories
Line 123  exec_prefix = @exec_prefix@ Line 124  exec_prefix = @exec_prefix@
 srcdir = @srcdir@  srcdir = @srcdir@
 bindir = @bindir@  bindir = @bindir@
 #read-only architecture-independent files  #read-only architecture-independent files
   datarootdir = @datarootdir@
 datadir = @datadir@  datadir = @datadir@
 #read-only architecture-dependent non-ascii files  #read-only architecture-dependent non-ascii files
 libdir = @libdir@  libdir = @libdir@
Line 263  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 265  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         regexp.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 xwords.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/string.fs test/float.fs test/gforth.fs \          test/coretest.fs test/postpone.fs test/dbltest.fs \
           test/string.fs test/float.fs test/search.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/primtest.fs test/coreext.fs test/deferred.fs \
         test/coremore.fs test/gforth-nofast.fs test/libcc.fs \          test/coremore.fs test/gforth-nofast.fs test/libcc.fs \
Line 307  ARCHS = \ Line 310  ARCHS = \
         arch/alpha/machine.h \          arch/alpha/machine.h \
         arch/arm/machine.h \          arch/arm/machine.h \
         arch/arm/cacheflush0.c \          arch/arm/cacheflush0.c \
         arch/arm/cacheflush1.c \          arch/arm/cacheflush-linux.c \
         arch/arm/cacheflush2.c \  
         arch/ia64/machine.h \          arch/ia64/machine.h \
         arch/ia64/flush_icache_block.c \          arch/ia64/flush_icache_block.c \
         arch/amd64/machine.h \          arch/amd64/machine.h \
Line 379  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 \  ENGINE_SOURCES = engine/Makefile.in engine/config.h.in \
         gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \  
         configure.in configure config.sub config.guess elisp-comp missing \  
         engine/config.h.in stamp-h.in envos.fs.in \  
         iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \  
         BUILD-FROM-SCRATCH model \  
         COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \  
         doc/gforth.ds doc/gforth.1 doc/version.texi.in \  
         doc/vmgen.texi doc/fdl.texi doc/gpl.texi \  
         gforth.el \  
         prim cache0.vmg cache1.vmg peeprules.vmg \  
         engine/engine.c engine/main.c \          engine/engine.c engine/main.c \
         engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \          engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \
         $(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/rint.c \          engine/ecvt.c engine/memcmp.c engine/rint.c \
Line 401  SOURCES = $(CVSDIRS) compat Makefile.in Line 392  SOURCES = $(CVSDIRS) compat Makefile.in
         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 \
         engine/fnmatch.h engine/fnmatch.c \          engine/fnmatch.h engine/fnmatch.c \
         INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \          engine/makefile.dos engine/makefile.os2
   
   SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
           gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \
           configure.in configure config.sub config.guess elisp-comp missing \
           stamp-h.in envos.fs.in \
           iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
           BUILD-FROM-SCRATCH model \
           COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
           doc/gforth.ds doc/gforth.1 doc/version.texi.in \
           doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
           gforth.el \
           $(ARCHS) \
           INSTALL.DOS makefile.dos mkdosmf.sed config.bat \
         dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \          dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \
         versions.bsh \          versions.bsh \
         configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \          configure.cmd mkos2mf.sed os2conf.h makefile.os2 \
         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 \
Line 415  RCS_FILES =  ToDo model high-level Line 419  RCS_FILES =  ToDo model high-level
   
 ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES)  ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES)
   
 ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE)   ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
   
 GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc  GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc
   
Line 436  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor Line 440  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec  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 gforth$(EXE)  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.ps            doc/vmgen.info doc/vmgen.ps
   
   BKERNLS = kernl16b$(EC).fi kernl16l$(EC).fi \
             kernl32b$(EC).fi kernl32l$(EC).fi \
             kernl64b$(EC).fi kernl64l$(EC).fi
   
 KERNLS = kernl16b$(EC).fi- kernl16l$(EC).fi- \  KERNLS = kernl16b$(EC).fi- kernl16l$(EC).fi- \
          kernl32b$(EC).fi- kernl32l$(EC).fi- \           kernl32b$(EC).fi- kernl32l$(EC).fi- \
          kernl64b$(EC).fi- kernl64l$(EC).fi-           kernl64b$(EC).fi- kernl64l$(EC).fi-
   
   # -------------        Make forth images
 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 \
         doc/vmgen.dvi doc/vmgen.ps \          doc/vmgen.dvi doc/vmgen.ps \
Line 455  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ Line 464  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
 .SUFFIXES:  .SUFFIXES:
 .SUFFIXES: .c .o  .SUFFIXES: .c .o
   
   all: kernel/version.fs more
 all:    kernel/version.fs more  
   
 # use this dependency for phony targets just as mostlyclean,...  # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;  FORCE: ;
Line 473  version: Makefile.in configure.in Line 481  version: Makefile.in configure.in
 kernel/version.fs:      version  kernel/version.fs:      version
         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          @$(MAKE) check
         @$(FORTH_FAST) --diag -e bye          @$(FORTH_FAST) --diag -e bye
   
 #from the gcc Makefile:   #from the gcc Makefile: 
Line 507  docclean: FORCE Line 515  docclean: FORCE
                 doc/gforth.toc doc/gforth.tp doc/gforth.vr html                  doc/gforth.toc doc/gforth.tp doc/gforth.vr html
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \          -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
                 engine/gforth$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \          gforth-itc-noll$(EC)$(EXE)  engine/gforth-itc-noll$(EC)$(EXE)  \
                 engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \          gforth-ditc-noll$(EC)$(EXE) engine/gforth-ditc-noll$(EC)$(EXE) \
                 engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) \          gforth-prof-noll$(EC)$(EXE) engine/gforth-prof-noll$(EC)$(EXE) \
                 engine/prim-s.i          engine/prim-s.i
           for i in gforth gforth-fast gforth-native; do for j in $(OPTS); do rm -f engine/$$i$${j}$(EC)$(EXE) $$i$${j}$(EC)$(EXE); done; done
   
 distclean:      clean  distclean:      clean
                 -$(RM) -rf config.cache config.log config.status \                  -$(RM) -rf config.cache config.log config.status \
Line 522  distclean: clean Line 531  distclean: clean
   
 #realclean is useless, but dangerous, so it's commented out  #realclean is useless, but dangerous, so it's commented out
 realclean:      distclean  realclean:      distclean
                 -$(RM) $(GEN_PRECIOUS)                  -$(RM) -f $(GEN_PRECIOUS) `cat .cvsignore`
   
 #mostlyclean, but also remove some of the stuff that is distributed  #mostlyclean, but also remove some of the stuff that is distributed
 virtualclean:   mostlyclean  virtualclean:   mostlyclean
Line 602  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 611  install: gforth$(EC)$(EXE) $(FORTH_SRC)
                         echo ">>>>>Please install gforth.elc 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 $(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)                  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" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
                 $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) gforth.fi install.TAGS                  $(RM) gforth.fi install.TAGS
Line 639  check:  gforths gforth.fi Line 648  check:  gforths gforth.fi
                 $(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$(EC)$(EXE) gforth.fi engine/prim-s.i  checkone test: gforth.fi engine/prim-s.i
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out                  $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&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                  $(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
Line 649  checkone test: gforth$(EC)$(EXE) gforth. Line 658  checkone test: gforth$(EC)$(EXE) gforth.
                   "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' | grep -v '^#line '|diff -c - engine/prim-s.i                    tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i
   
 check-nofast: gforth$(EC)$(EXE) gforth.fi  check-nofast: gforth.fi
                 $(FORTHS) test/gforth-nofast.fs -e bye                  $(FORTHS) test/gforth-nofast.fs -e bye
   
 test/primtest.fi: test/primtest.fs mach32l.fs cross.fs  test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
Line 668  bench:  gforth-fast$(EC)$(EXE) gforth.fi Line 677  bench:  gforth-fast$(EC)$(EXE) gforth.fi
 onebench one-bench:  onebench one-bench:
         $(FORTH_FAST) onebench.fs          $(FORTH_FAST) onebench.fs
   
 all-bench allbench:     gforth-fast$(EC)$(EXE) gforth$(EC)$(EXE) gforth-itc$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth.fi  all-bench allbench:
         ./gforth-fast --dynamic onebench.fs          ./gforth-fast --dynamic onebench.fs
         ./gforth-fast --no-dynamic onebench.fs          ./gforth-fast --no-dynamic onebench.fs
         ./gforth --dynamic onebench.fs          ./gforth --dynamic onebench.fs
Line 687  all-bench allbench: gforth-fast$(EC)$(EX Line 696  all-bench allbench: gforth-fast$(EC)$(EX
 #    these are the ones we want to use now  #    these are the ones we want to use now
   
 kernl16l$(EC).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$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl16b$(EC).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$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32l$(EC).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$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32b$(EC).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$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64l$(EC).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$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64b$(EC).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$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -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)
 @GNUMAKE@               $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"  @GNUMAKE@               $(PREFORTH) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
 @GNUMAKE@               if [ -f `echo $< | sed s/fs/sh/` ]; \  @GNUMAKE@               if [ -f `echo $< | sed s/fs/sh/` ]; \
 @GNUMAKE@               then sh `echo $< | sed s/fs/sh/` $@; \  @GNUMAKE@               then sh `echo $< | sed s/fs/sh/` $@; \
 @GNUMAKE@               else $(CP) $@- $@; \  @GNUMAKE@               else $(CP) $@- $@; \
Line 743  kernl64l$(EC).fi: $(KERNLS) Line 752  kernl64l$(EC).fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs  gforth.fi:      $(kernel_fi) gforthmi 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)" includedir=`pwd`/include bindir=`pwd` ./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
Line 752  prim.b:  prim cache0.vmg Line 761  prim.b:  prim cache0.vmg
                 $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@                  $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@
                 sleep 1 #should make hpux-workaround unnecessary                  sleep 1 #should make hpux-workaround unnecessary
   
 prim-fast.b:    prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in  prim-fast.b:    prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg cache-regs$(STACK_CACHE_REGS).vmg peeprules.vmg Makefile
                 $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@                  $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -DSTACK_CACHE_REGS=cache-regs$(STACK_CACHE_REGS).vmg $(srcdir)/prim >$@
                 sleep 1 #should make hpux-workaround unnecessary                  sleep 1 #should make hpux-workaround unnecessary
   
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs  $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs
                 GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast                  GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast
   
 $(FORTH_GEN_ENGINE): prim.b prims2x.fs  $(FORTH_GEN_ENGINE): prim.b prims2x.fs
                 GFORTH="$(FORTHP)" $(srcdir)/gfgen                  GFORTH="$(PREFORTH)" $(srcdir)/gfgen
   
 engine/prim-s.i: engine/prim.i  engine/prim-s.i: engine/prim.i
         grep -v '^#line ' $(srcdir)/engine/prim.i >$@          grep -v '^#line ' $(srcdir)/engine/prim.i >$@
   
 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 $@-
                 $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@-                  $(PREFORTH) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 kernel/prim.fs: prim.b prims2x.fs kernel/prim0.fs  kernel/prim.fs: prim.b prims2x.fs kernel/prim0.fs
                 $(CP) kernel/prim0.fs kernel/prim.fs-                  $(CP) kernel/prim0.fs kernel/prim.fs-
                 $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@-                  $(PREFORTH) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 gforth$(EC)$(EXE):              engines  
                 -$(CP) gforth$(EC)$(EXE) gforth~  
                 $(CP) engine/$@ $@  
                 -$(MASSAGE_EXE) $@  
                 @GFORTH_EXE@  
   
 gforth-fast$(EC)$(EXE): engines-fast  OPTS = @OPTS@
                 $(CP) engine/$@ $@  
                 -$(MASSAGE_EXE) $@  MAKELINE-ll-reg   = OPT=-ll-reg OPTDEFINES="-DFORCE_LL -DFORCE_REG" OPTOBJECTS=
                 @GFORTHFAST_EXE@  MAKELINE-noll-reg = OPT=-noll-reg OPTDEFINES=-DFORCE_REG OPTOBJECTS=dblsub.o
   MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=
   MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o
   
   gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h
           if test -z "$(OPT)"; then \
                   for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \
           else \
                   ( cd engine && $(MAKE) $@ ) && \
                   $(CP) gforth$(OPT)$(EC)$(EXE) gforth~; \
                   $(CP) engine/$@ $@ && \
                   $(MASSAGE_EXE) $@; \
                   @GFORTH_EXE@; \
                   $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
           fi
   
   optgforth:
           $(MAKE) gforth$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT))
   
   gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h
           if test -z "$(OPT)"; then \
                   for i in $(OPTS); do $(MAKE) optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EC)$(EXE) $@ && break; done; \
           else \
                   ( cd engine && $(MAKE) $@ ) && \
                   $(CP) engine/$@ $@ && \
                   $(MASSAGE_EXE) $@; \
                   @GFORTHFAST_EXE@; \
                   $(MAKE) checkone ENGINE=./engine/$@; \
           fi
   
 gforth-native$(EC)$(EXE):       engines-fast  optgforth-fast:
           $(MAKE) gforth-fast$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT))
   
   gforth-native$(OPT)$(EC)$(EXE): engines-fast
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 -$(MASSAGE_EXE) $@                  -$(MASSAGE_EXE) $@
 #@GFORTHX_EXE@  #@GFORTHX_EXE@
   
 gforth-itc$(EC)$(EXE):  engines  gforth-itc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 $(CP) engine/$@ $@                  cd engine && $(MAKE) gforth-itc-noll$(EC)$(EXE) $(MAKELINE-noll)
                   $(CP) engine/gforth-itc-noll$(EC)$(EXE) $@
                 @GFORTHITC_EXE@                  @GFORTHITC_EXE@
   
 gforth-ditc$(EC)$(EXE): engines  gforth-ditc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 $(CP) engine/$@ $@                  cd engine && $(MAKE) gforth-ditc-noll$(EC)$(EXE) $(MAKELINE-noll)
                   $(CP) engine/gforth-ditc-noll$(EC)$(EXE) $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 gforth-prof$(EC)$(EXE): engines  gforth-prof$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 $(CP) engine/$@ $@                  cd engine && $(MAKE) gforth-prof-noll$(EC)$(EXE) $(MAKELINE-noll)
                   $(CP) engine/gforth-prof-noll$(EC)$(EXE) $@
   
 gforths: $(ENGINES) $(ENGINES_FAST)  gforths: $(ENGINES) $(ENGINES_FAST)
   
 engines:        FORCE $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h  
                 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 829  TAGS:  gforth.TAGS Line 861  TAGS:  gforth.TAGS
 tags:           gforth.tags  tags:           gforth.tags
                 $(CP) gforth.tags $@                  $(CP) gforth.tags $@
   
 install.TAGS:   gforth.TAGS  install.TAGS:   TAGS
                 sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS                  sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >install.TAGS
   
 gforth.TAGS:    @kernel_fi@ gforth$(EC)$(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
Line 843  gforth.tags: @kernel_fi@ gforth$(EC)$(EX Line 875  gforth.tags: @kernel_fi@ gforth$(EC)$(EX
                 rm tags                  rm tags
   
 prim.TAGS:      prim.b prims2x.fs  prim.TAGS:      prim.b prims2x.fs
                 #echo '2c\' >prim.TAGS.sed                  $(PREFORTH) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye"|sed 's#^./prim#prim#' >$@-
                 #echo $(srcdir)/prim >>prim.TAGS.sed  
                 #$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@-  
                 $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" >$@-  
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 prim.tags:      prim.b prims2x.fs  prim.tags:      prim.b prims2x.fs
                 #echo '2c\' >prim.TAGS.sed                  #echo '2c\' >prim.TAGS.sed
                 #echo $(srcdir)/prim >>prim.TAGS.sed                  #echo $(srcdir)/prim >>prim.TAGS.sed
                 #$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@-                  #$(PREFORTH) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@-
                 $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-vi-tag dup process-file bye" >$@-                  $(PREFORTH) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-vi-tag dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 871  gforth.elc: gforth.el Line 900  gforth.elc: gforth.el
 #Documentation  #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 regexp.fs fft.fs -e bye
   
 doc/crossdoc.fd:        $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  doc/crossdoc.fd:        $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye                  $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye
   
 doc/gforth.texi:        doc/gforth.ds prim.b ds2texi.fs prims2x.fs \  doc/gforth.texi: doc/gforth.ds prim.b ds2texi.fs prims2x.fs \
                 doc/doc.fd doc/crossdoc.fd                  doc/doc.fd doc/crossdoc.fd
                 $(FORTHP) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@-                  $(PREFORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 961  config.status: configure Line 990  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 engine/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
         sed -f mkdosmf.sed <engine/Makefile.in >engine/makefile.dos          sed -f mkdosmf.sed <engine/Makefile.in >engine/makefile.dos
   
 makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in  makefile.os2 engine/makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in
         sed -f mkos2mf.sed <Makefile.in >makefile.os2          sed -f mkos2mf.sed <Makefile.in >makefile.os2
         sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2          sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2
         echo '%.o:      %.c' >>makefile.os2          echo '%.o:      %.c' >>makefile.os2

Removed from v.1.362  
changed lines
  Added in v.1.390


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