Diff for /gforth/Makefile.in between versions 1.143 and 1.197

version 1.143, 1999/01/08 16:58:29 version 1.197, 2001/01/28 18:49:10
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 16 Line 16
   
 #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, write to the Free Software
 #Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  #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 31 Line 31
 # ------------- gforth version  # ------------- gforth version
   
 VERSION = @VERSION@  VERSION = @VERSION@
 DOSVERSION=`echo $(VERSION)|sed 's/\.//g'`  DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'`
   
 # ------------- System specific variables         # ------------- System specific variables       
   
Line 53  osclass = @OSCLASS@ Line 53  osclass = @OSCLASS@
 SHELL   = /bin/sh  SHELL   = /bin/sh
 RM      = rm  RM      = rm
 RMTREE  = rm -rf  RMTREE  = rm -rf
 CP      = cp  CP      = cp -p
 MV      = mv  MV      = mv
 TAR     = tar cf -  TAR     = tar cf -
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
Line 70  FORTH = $(ENGINE) $(FORTH_ARGS) Line 70  FORTH = $(ENGINE) $(FORTH_ARGS)
 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)
 FORTHK  = ./gforth $(FORTHKFLAGS)  FORTHK  = $(ENGINE) $(FORTHKFLAGS)
 FORTHP  = ./gforth --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
   # in exboot.fs
   STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi  TEXI2DVI = texi2dvi -e
 DVI2PS  = dvips -Z  DVI2PS  = dvips -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/  #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 TEXI2HTML = texi2html  
 MAKEINFO = makeinfo  MAKEINFO = makeinfo
   TEXI2HTML = texi2html
   
 # ------------- Compiler Flags  # ------------- Compiler Flags
   
Line 86  XDEFINES = @DEFS@ Line 89  XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions  SWITCHES = $(XCFLAGS) $(XDEFINES) #-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) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\"  CFLAGS  = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\"
   
 #John Wavrik should use -Xlinker -N to get a writable text (executable)  #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@  XLDFLAGS = @LDFLAGS@
Line 113  emacssitelispdir=@lispdir@ Line 116  emacssitelispdir=@lispdir@
 siteforthdir=$(datadir)/gforth/site-forth  siteforthdir=$(datadir)/gforth/site-forth
   
 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 \          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/shboom/CVS arch/sharc/CVS arch/ia64/CVS
   
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h  INCLUDES = engine/forth.h engine/threaded.h engine/io.h
   
 KERN_SRC = \  KERN_SRC = \
           mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
           machpc.fs \
         kernel/aliases0.fs \          kernel/aliases0.fs \
         kernel/aliases.fs \          kernel/aliases.fs \
         kernel/args.fs \          kernel/args.fs \
         chains.fs \          chains.fs \
           kernel/cbr.fs \
           kernel/cloop.fs \
         kernel/cond.fs \          kernel/cond.fs \
         kernel/cond-old.fs \          kernel/cond-old.fs \
         cross.fs \          cross.fs \
Line 138  KERN_SRC = \ Line 145  KERN_SRC = \
         kernel/main.fs \          kernel/main.fs \
         kernel/prim0.fs \          kernel/prim0.fs \
         search.fs \          search.fs \
         kernel/special.fs \          kernel/quotes.fs \
         kernel/tools.fs \          kernel/tools.fs \
         kernel/toolsext.fs \          kernel/toolsext.fs \
         kernel/vars.fs \          kernel/vars.fs \
Line 147  KERN_SRC = \ Line 154  KERN_SRC = \
         kernel/int.fs \          kernel/int.fs \
         kernel/comp.fs \          kernel/comp.fs \
         kernel/io.fs \          kernel/io.fs \
           kernel/input.fs \
         kernel/license.fs \          kernel/license.fs \
         kernel/nio.fs \          kernel/nio.fs \
         kernel/saccept.fs \          kernel/saccept.fs \
         kernel/doers.fs \          kernel/doers.fs \
         kernel/getdoers.fs          kernel/getdoers.fs \
           kernel/pass.fs
   
 EC_SRC = \  EC_SRC = \
         asm/README \          asm/README \
Line 162  EC_SRC = \ Line 171  EC_SRC = \
         asm/target.fs \          asm/target.fs \
         ec/README \          ec/README \
         ec/mirror.fs \          ec/mirror.fs \
         ec/mirrors.fs \  
         ec/shex.fs \          ec/shex.fs \
         ec/builttag.fs \          ec/builttag.fs \
         ec/dotx.fs \          ec/dotx.fs \
         ec/mirrored.fs \  
         ec/nesting.fs          ec/nesting.fs
   
 GFORTH_FI_SRC = \  GFORTH_FI_SRC = \
         assert.fs \          assert.fs \
           backtrac.fs \
         blocked.fb \          blocked.fb \
         blocks.fs \          blocks.fs \
         bufio.fs \          bufio.fs \
         debug.fs \          debug.fs \
         debugs.fs \          debugs.fs \
           ekey.fs \
         savesys.fs \          savesys.fs \
         environ.fs \          environ.fs \
         errors.fs \          errors.fs \
           exboot.fs \
           except.fs \
         extend.fs \          extend.fs \
         float.fs \          float.fs \
         glocals.fs \          glocals.fs \
Line 199  GFORTH_FI_SRC = \ Line 210  GFORTH_FI_SRC = \
         vt100.fs \          vt100.fs \
         vt100key.fs \          vt100key.fs \
         wordinfo.fs \          wordinfo.fs \
         lib.fs \          arch/386/asm.fs arch/386/disasm.fs \
         sieve.fs \          arch/alpha/asm.fs arch/alpha/disasm.fs \
         add.fs          arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.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 \
         code.fs colorize.fs comp-i.fs \          code.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 \          glosgen.fs gray.fs httpd.fs proxy.fs \
         doc/makedoc.fs \          make-app.fs doc/makedoc.fs \
         mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \          more.fs other.fs prims2x.fs random.fs \
         machpc.fs more.fs other.fs prims2x.fs random.fs \          table.fs string.fs \
         table.fs \  
         tt.fs sokoban.fs \          tt.fs sokoban.fs \
         unbuffered.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/other.fs test/checkans.fs \          test/other.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 \
           add.fs lib.fs sieve.fs unix/socket.fs
   
 COMPAT = compat/README \  COMPAT = compat/README \
         compat/anslocal.fs \          compat/anslocal.fs \
Line 245  ARCHS = \ Line 257  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/4stack/README \          arch/4stack/README \
         arch/4stack/asm.fs \          arch/4stack/asm.fs \
         arch/4stack/mach.fs \          arch/4stack/mach.fs \
Line 281  ARCHS = \ Line 295  ARCHS = \
         arch/shboom/prim.fs \          arch/shboom/prim.fs \
         arch/shboom/dis2.fs \          arch/shboom/dis2.fs \
         arch/shboom/sh.p \          arch/shboom/sh.p \
         arch/shboom/doers.fs          arch/shboom/doers.fs \
           arch/sharc/mach.fs \
           arch/sharc/machine.h \
           arch/sharc/compile.sharc \
           arch/sharc/unistd.h \
           arch/sharc/systypes.h \
           arch/sharc/types.h \
           arch/sharc/g21k-3.3.4-bp1.diff
   
 SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \  SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \
         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 \          acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \
         install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \          iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \
         COPYING AUTHORS ChangeLog Benchres aclocal.m4 \          COPYING 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 \
         gforth.el \          gforth.el \
         prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \          prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \
         $(ARCHS) \          engine/signals.c $(ARCHS) \
         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 \
         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 \
         INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \          INSTALL.DOS makefile.dos engine/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 engine/makefile.os2 \
         gforthmi.cmd glosgen.glo doc/glossaries.doc \          gforthmi.cmd glosgen.glo doc/glossaries.doc \
         $(INCLUDES) $(FORTH_SRC) $(COMPAT) \          $(INCLUDES) $(FORTH_SRC) $(COMPAT) \
         timings.sc          timings.sc \
           test/coretest.out test/checkans.out
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
Line 347  kernel/version.fs: version Line 370  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) gforth$(EXE)  more:   engine $(FORTH_GEN) $(GEN)
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 370  mostlyclean: FORCE Line 393  mostlyclean: FORCE
                 doc/gforth.toc doc/gforth.tp doc/gforth.vr html \                  doc/gforth.toc doc/gforth.tp doc/gforth.vr html \
                 gforth-$(VERSION).tar.gz                  gforth-$(VERSION).tar.gz
   
   # Just the stuff needed to rebuild the documentation nac03feb1999
   docclean:       FORCE
                   -$(RM) -rf doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \
                   doc/gforth.aux doc/gforth.cp doc/gforth.cps \
                   doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \
                   doc/gforth.pg \
                   doc/gforth.toc doc/gforth.tp doc/gforth.vr html
   
 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-fast$(EXE) engine/gforth-ditc$(EXE) \
Line 382  distclean: clean Line 413  distclean: clean
                 doc/version.texi gforthmi                  doc/version.texi gforthmi
   
 #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) $(GEN_PRECIOUS)
   
 #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 419  binonlydist: Makedist FORCE Line 450  binonlydist: Makedist FORCE
   
   
 #strip gforth, because the debugging stuff is hardly useful once  #strip gforth, because the debugging stuff is hardly useful once
 # gforth manages to execute more than a few primitives  # gforth manages to execute more than a few primitives.
   
 #install does not depend on gforth.info, because that would require  #install does not depend on gforth.info, because that would require
 #supplying a lot of files that can be easily generated (only info is  #supplying a lot of files that can be easily generated (only info is
 #hard to generate)  #hard to generate).
   #we rebuild gforth.fi, because it contains some path names.
   #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.
 install:        gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs  install:        gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs
                 touch $(siteforthdir)/siteinit.fs                  touch $(siteforthdir)/siteinit.fs
                 -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi                  -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi
                   -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
                 $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)                  $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
                 $(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/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)
                 $(LN_S) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-fast$(EXE)                  (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))
                 $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)                  $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
                 $(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi                  $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)
                   (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
                 -$(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*; 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
                 $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)                  $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)
                 $(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.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names  
                 $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)  
                 $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS  
                 @if test -d "$(emacssitelispdir)"; then \                  @if test -d "$(emacssitelispdir)"; then \
                         $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \                          $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
                 else \                  else \
                         echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \                          echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
                 fi                  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)
                   $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
                   $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
                   $(RM) gforth.fi install.TAGS
                 @echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \                  @echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \
                 echo "* Gforth: (gforth).       A fast interpreter for the Forth language."                  echo "* Gforth: (gforth).       A fast interpreter for the Forth language."
   
Line 460  installdirs: mkinstalldirs Line 496  installdirs: mkinstalldirs
                 for i in $(CVSDIRS); do \                  for i in $(CVSDIRS); do \
                         $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \                          $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \
                 done                  done
                 $(RM) -rf $(datadir)/gforth/$(VERSION)/arch $(datadir)/gforth/$(VERSION)/engine                  $(RM) -rf $(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)/gforthmi-$(VERSION)                  -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforthmi-$(VERSION)
                 @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(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)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth"
   
 check test:     gforth$(EXE) gforth.fi  check test:     gforth$(EXE) gforth.fi
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye                  $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye | diff -c - $(srcdir)/test/coretest.out
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 @echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'"                  $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out
                 @echo "Expect 'Missing: EDITOR FORGET'"                  $(FORTH) -m 100000 prims2x.fs -e \
                 $(FORTH) code.fs test/checkans.fs -e bye                    "c-flag on s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
                 @echo 'Expect no differences'                    diff -c - $(srcdir)/engine/prim.i
                 $(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| 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 486  bench:  gforth-fast$(EXE) gforth.fi Line 521  bench:  gforth-fast$(EXE) gforth.fi
   
 # ------------- Make forth images  # ------------- Make forth images
   
 # Hot to make new images:  # How to make new images:
 # 1. Produce an image called kernlXYZ.fi-  # 1. Produce an image called kernlXYZ.fi-
 #    the original kernel.fi is not touched because it's needed for creation  #    the original kernel.fi is not touched because it's needed for creation
 # 2. copy old kernlXYZ.fi to kernlXYZ.fi~  # 2. copy old kernlXYZ.fi to kernlXYZ.fi~
Line 495  bench:  gforth-fast$(EXE) gforth.fi Line 530  bench:  gforth-fast$(EXE) gforth.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 $(FORTH_GEN0)  kernl16l.fi-:   $(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -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 $(FORTH_GEN0)  kernl16b.fi-:   $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"
Line 512  kernl64l.fi-: $(KERN_SRC) kernel/version Line 547  kernl64l.fi-: $(KERN_SRC) kernel/version
 kernl64b.fi-:   $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)  kernl64b.fi-:   $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl-%.fi:     arch/%/mach.fs \  kernl-%.fi:     arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  
                 $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
                 if [ -f `echo $< | sed s/fs/sh/` ]; \                  if [ -f `echo $< | sed s/fs/sh/` ]; \
                 then sh `echo $< | sed s/fs/sh/` $@; \                  then sh `echo $< | sed s/fs/sh/` $@; \
                 else $(CP) $@- $@; \                  else $(CP) $@- $@; \
                 fi                  fi
   
 arch/%/mach.fs: arch/%/prim.fs  #SunOS make does not like that
   #arch/%/mach.fs:        arch/%/prim.fs arch/%/asm.fs
 arch/%/prim.fs: arch/%/asm.fs  
   
 kernl16b.fi:    $(KERNLS)  kernl16b.fi:    $(KERNLS)
                 -$(CP) kernl16b.fi kernl16b.fi~                  -$(CP) kernl16b.fi kernl16b.fi~
Line 553  kernl64l.fi: $(KERNLS) Line 586  kernl64l.fi: $(KERNLS)
 #               -$(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)
                 GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.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)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
Line 561  prim.b:  prim Line 594  prim.b:  prim
                 m4 -s $(srcdir)/prim >$@                   m4 -s $(srcdir)/prim >$@ 
   
 engine/prim.i:          prim.b prims2x.fs  engine/prim.i:          prim.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-c process-file bye" >$@-                  $(FORTH) -m 1000000 prims2x.fs -e "c-flag on s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 engine/prim_lab.i:      prim.b prims2x.fs  engine/prim_lab.i:      prim.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-label process-file bye" >$@-                  $(FORTH) -m 1000000 prims2x.fs -e "c-flag on s\" prim.b\" ' output-label dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(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 $@-
                 $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-alias process-file bye" >>$@-                  $(FORTH) -m 1000000 prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup 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-
                 $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-forth process-file bye" >>$@-                  $(FORTH) -m 1000000 prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 595  gforth-ditc$(EXE): engines Line 628  gforth-ditc$(EXE): engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 engines:        FORCE engine/Makefile  engines:        FORCE engine/Makefile engine/prim.i engine/prim_lab.i
                 cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE)                  cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE)
   
 # ------------- additional C primitives  # ------------- additional C primitives
Line 615  TAGS:  gforth.TAGS Line 648  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 $(GFORTH_FI_SRC) prim.TAGS  gforth.TAGS:    @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
                 $(FORTHK) etags.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
   
 prim.TAGS:      prim.b prims2x.fs  prim.TAGS:      prim.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" >$@-                  #echo '2c\' >prim.TAGS.sed
                   #echo $(srcdir)/prim >>prim.TAGS.sed
                   #$(FORTH) -m 1000000 prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@-
                   $(FORTH) -m 1000000 prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs  kernel.TAGS:
                 $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.fs -e bye                  rm kernl16l.fi-; $(MAKE) @kernel_fi@
   
   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
   
 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
                 $(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@-                  $(FORTH) -m 100000 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) $@-
   
 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
                 $(FORTHK) -m 1M ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye                  $(FORTH) -m 1M 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
Line 654  info:  doc/gforth.info Line 693  info:  doc/gforth.info
 doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)  doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)
                 -cd doc; $(MAKEINFO) gforth.texi                  -cd doc; $(MAKEINFO) gforth.texi
   
   ### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
 html:           $(GFORTH_TEXI)  html:           $(GFORTH_TEXI)
                 -$(RMTREE) html                  -$(RMTREE) html
                 -mkdir html                  -mkdir html
                 cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi                  cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi
   ###             cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.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:            doc/gforth.ps html doc/gforth.txt  doc:            info html doc/gforth.ps doc/gforth.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.
 $(srcdir)/configure:    configure.in aclocal.m4  
   #Note: no target "$(srcdir)/configure", because that does not trigger 
   #unless $(srcdir)!="."
   configure:      configure.in aclocal.m4
                 cd $(srcdir) && autoconf                  cd $(srcdir) && autoconf
   
 aclocal.m4:     acinclude.m4 configure.in  aclocal.m4:     acinclude.m4 configure.in

Removed from v.1.143  
changed lines
  Added in v.1.197


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