Diff for /gforth/Makefile.in between versions 1.99 and 1.100

version 1.99, 1997/04/10 15:41:49 version 1.100, 1997/05/21 20:39:15
Line 58  XDEFINES = @DEFS@ Line 58  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. -I$(srcdir) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\"  CFLAGS  = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir) -O4 -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 82  man1ext= .1 Line 82  man1ext= .1
 #older emacses have their site-lisp in $(libdir)/emacs/  #older emacses have their site-lisp in $(libdir)/emacs/
 emacssitelispdir=$(datadir)/emacs/site-lisp  emacssitelispdir=$(datadir)/emacs/site-lisp
   
 INCLUDES = forth.h threading.h io.h  INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h
   
 KERN_SRC = \  KERN_SRC = \
         aliases0.fs \          kernel/CVS \
         aliases.fs \          kernel/aliases0.fs \
         args.fs \          kernel/aliases.fs \
         conditionals.fs \          kernel/args.fs \
         cond-old.fs \          kernel/cond.fs \
           kernel/cond-old.fs \
         cross.fs \          cross.fs \
         errore.fs \          kernel/errore.fs \
         files.fs \          kernel/files.fs \
         kernel.fs \          kernel/require.fs \
         main.fs \          kernel/paths.fs \
         primitives0.fs \          kernel/kernel.fs \
         search-order.fs \          kernel/main.fs \
         special.fs \          kernel/prim0.fs \
         tools.fs \          search.fs \
         toolsext.fs \          kernel/special.fs \
         vars.fs          kernel/tools.fs \
           kernel/toolsext.fs \
           kernel/vars.fs \
           kernel/accept.fs \
           kernel/basics.fs \
           kernel/interp.fs \
           kernel/io.fs \
           kernel/license.fs \
           kernel/nio.fs \
           kernel/saccept.fs
   
 GFORTH_FI_SRC = \  GFORTH_FI_SRC = \
         assert.fs \          assert.fs \
         blockedit.fb \          blocked.fb \
         blocks.fs \          blocks.fs \
         bufio.fs \          bufio.fs \
         debug.fs \          debug.fs \
         debugging.fs \          debugs.fs \
         dumpimage.fs \          savesys.fs \
         environ.fs \          environ.fs \
         errors.fs \          errors.fs \
         extend.fs \          extend.fs \
Line 119  GFORTH_FI_SRC = \ Line 129  GFORTH_FI_SRC = \
         history.fs \          history.fs \
         intcomp.fs \          intcomp.fs \
         look.fs \          look.fs \
         search-order.fs \          search.fs \
         see.fs \          see.fs \
         see-ext.fs \          see-ext.fs \
         source.fs \          source.fs \
Line 134  GFORTH_FI_SRC = \ Line 144  GFORTH_FI_SRC = \
   
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \
         ans-report.fs ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         checkans.fs \          code.fs colorize.fs comp-i.fs \
         code.fs colorize.fs comp-image.fs \  
         doskey.fs ds2texi.fs \          doskey.fs ds2texi.fs \
         etags.fs filedump.fs \          etags.fs filedump.fs \
         glosgen.fs gray.fs \          glosgen.fs gray.fs \
         makedoc.fs \          doc/makedoc.fs \
         mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \          mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
         more.fs other.fs prims2x.fs random.fs \          more.fs other.fs prims2x.fs random.fs \
         sieve.fs \          siteinit.fs \
         site-init.fs \  
         tt.fs sokoban.fs \          tt.fs sokoban.fs \
         wordsets.fs \          wordsets.fs \
         tester.fs coretest.fs postponetest.fs dbltest.fs other-tests.fs \          test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
           test/other.fs test/checkans.fs test/CVS \
         bubble.fs siev.fs matrix.fs fib.fs \          bubble.fs siev.fs matrix.fs fib.fs \
         oof.fs oofsampl.fs objects.fs          oof.fs oofsampl.fs objects.fs
   
 SOURCES = CVS compat Makefile.in gforth-makeimage \  COMPAT  = compat/CVS compat/README compat/control.fs compat/anslocal.fs \
           compat/struct.fs compat/loops.fs
   
   ALLSUBDIRS = engine
   
   SOURCES = CVS compat Makefile.in engine/Makefile.in gforthmi \
         configure.in configure config.sub config.guess \          configure.in configure config.sub config.guess \
         acconfig.h config.h.in stamp-h.in \          acconfig.h engine/config.h.in stamp-h.in \
         install-sh INSTALL README ToDo BUGS model COPYING Benchres \          install-sh INSTALL README ToDo BUGS model COPYING Benchres \
         gforth.ds texinfo.tex gforth.1 gforth.el \          doc/gforth.ds doc/texinfo.tex doc/gforth.1 gforth.el \
         primitives engine.c main.c io.c memcasecmp.c \          prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \
         m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \          arch/m68k/machine.h arch/mips/machine.h arch/386/machine.h \
         getopt.c getopt1.c getopt.h select.c \          arch/hppa/machine.h arch/sparc/machine.h arch/power/machine.h \
         ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c atanh.c \          arch/alpha/machine.h \
         strerror.c strsignal.c dblsub.c \          engine/cache.c engine/32bit.h \
         INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \          engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
         gforth-makeimage.bat startup.dos history.dos mkinstalldirs \          engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \
         configure.cmd mkos2mf.sed os2conf.h makefile.os2 gforth-makeimage.cmd \          engine/ansidecl.h engine/memmove.c \
         glosgen.glo glossaries.doc \          engine/pow10.c engine/atanh.c \
         $(INCLUDES) $(FORTH_SRC)          engine/strerror.c engine/strsignal.c engine/strsig.c engine/dblsub.c \
           INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \
           dosconf.h gforthmi.bat startup.dos history.dos mkinstalldirs \
           configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \
           gforthmi.cmd glosgen.glo doc/glossaries.doc \
           $(INCLUDES) $(FORTH_SRC) $(COMPAT)
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 GEN = gforth gforth-ditc version.fs version-stamp  GEN = gforth gforth-ditc kernel/version.fs version-stamp
   
 OBJECTS0 = io.o memcasecmp.o @LIBOBJS@ @getopt_long@  OBJECTS0 = engine/replace.a
 OBJECTS = engine.o main.o  OBJECTS = engine/engine.o engine/main.o
 OBJECTS_DITC =  engine-ditc.o main-ditc.o  OBJECTS_DITC =  engine/engine-ditc.o engine/main-ditc.o
   
 # things that need a working forth system to be generated  # things that need a working forth system to be generated
 FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs primitives.fs  FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.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@ 
   
 #distributed documentation  #distributed documentation
 DOCDIST = gforth.info gforth.info-* gforth.ps  DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps
   
 #stuff in a binonly distribution   #stuff in a binonly distribution 
 BINONLYDIST = config.status Makefile gforth gforth-ditc \  BINONLYDIST = config.status Makefile gforth gforth-ditc \
         $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\          $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
         machine.h config.h kernel.fi \          machine/machine.h engine/config.h kernel.fi \
         stamp-h version.h version.fs version-stamp \          stamp-h engine/version.h kernel/version.fs version-stamp \
         INSTALL.BINDIST          INSTALL.BINDIST
   
 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) gforth.texi gforth.dvi gforth.ps Makefile configure  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile configure
   
 #standards.info recommends this:  #standards.info recommends this:
 .SUFFIXES:  .SUFFIXES:
 .SUFFIXES: .c .o  .SUFFIXES: .c .o
   
 all:    version.fs more  all:    kernel/version.fs more
   
 #this rule avoids remaking everything after minor changes in Makefile.in  #this rule avoids remaking everything after minor changes in Makefile.in
 version-stamp:  Makefile.in  version:        Makefile.in
                 if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi                  if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi
   
 version.h:      version-stamp  engine/version.h:       version
                 echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@                  echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@
   
 version.fs:     version-stamp  kernel/version.fs:      version
                 $(MAKE) gforth                  $(MAKE) gforth
                 echo ": version-string s\" $(VERSION)\" ;" >$@                  echo ": version-string s\" $(VERSION)\" ;" >$@
   
Line 227  more: $(OBJECTS) $(FORTH_GEN) gforth Line 246  more: $(OBJECTS) $(FORTH_GEN) gforth
 # `realclean' also deletes everything that could be regenerated automatically."  # `realclean' also deletes everything that could be regenerated automatically."
   
 mostlyclean:  mostlyclean:
                 -$(RM) -rf *.s gforth.fi *.fi~ *.fi- version.fs *TAGS \                  -$(RM) -rf *.s gforth.fi *.fi~ *.fi- kernel/version.fs *TAGS \
                 crossdoc.fd doc.fd gforth.texi gforth.fns gforth.aux gforth.cp gforth.cps \                  doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \
                 gforth.dvi gforth.fn gforth.ky gforth.log gforth.pg \                  doc/gforth.aux doc/gforth.cp doc/gforth.cps \
                 gforth.toc gforth.tp gforth.vr html gforth-$(VERSION).tar.gz \                  doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \
                 version.h                  doc/gforth.pg \
                   doc/gforth.toc doc/gforth.tp doc/gforth.vr html \
                   gforth-$(VERSION).tar.gz \
                   engine/version.h
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) *.o                   -$(RM) -rf $(GEN) *.o engine/*.o engine/*.a
   
 distclean:      clean  distclean:      clean
                 -$(RM) machine.h kernel.fi config.cache config.log \                  -$(RM) machine/machine.h kernel.fi config.cache config.log \
                 config.status config.h Makefile stamp-h                  config.status engine/config.h Makefile stamp-h
   
 #realclean is useless, but dangerous, so it's commented out  #realclean is useless, but dangerous, so it's commented out
 #realclean:     distclean  #realclean:     distclean
Line 253  virtualclean: mostlyclean Line 275  virtualclean: mostlyclean
 dist:           $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)  dist:           $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)
                 -$(RMTREE) gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) gforth-$(VERSION)                  $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \
                           (cd gforth-$(VERSION); tar xf -)
                 $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz
                 -$(RMTREE) gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
   
Line 261  dist:  $(SOURCES) $(FORTH_GEN0) @KERNEL@ Line 284  dist:  $(SOURCES) $(FORTH_GEN0) @KERNEL@
 dosdist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)  dosdist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)
                 -$(RMTREE) gforth.$(DOSVERSION)                  -$(RMTREE) gforth.$(DOSVERSION)
                 mkdir gforth.$(DOSVERSION)                  mkdir gforth.$(DOSVERSION)
                 $(CP) -rp $(SOURCES) $(FORTH_GEN) $(DOCDIST) gforth.$(DOSVERSION)                  $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \
                 zip -r9 gforth.zip gforth.$(DOSVERSION)/*                          (cd gforth.$(DOSVERSION); tar xf -)
                   zip -r9 gf$(DOSVERSION)dos.zip gforth.$(DOSVERSION)/*
                 -$(RMTREE) gforth.$(DOSVERSION)                  -$(RMTREE) gforth.$(DOSVERSION)
   
 #A source distribution contains only the things needed to install gforth,  #A source distribution contains only the things needed to install gforth,
Line 270  dosdist: $(SOURCES) $(FORTH_GEN0) @KERNE Line 294  dosdist: $(SOURCES) $(FORTH_GEN0) @KERNE
 srcdist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@  srcdist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@
                 -$(RMTREE) gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -rp $(SOURCES) $(FORTH_GEN0) @KERNEL@ gforth-$(VERSION)                  $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ | \
                           (cd gforth-$(VERSION); tar xf -)
                 $(TAR) gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-src-$(VERSION).tar.gz
                 -$(RMTREE) gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
   
   srconlydist:    $(SOURCES)
                   -$(RMTREE) gforth-$(VERSION)
                   mkdir gforth-$(VERSION)
                   $(TAR) $(SOURCES) | \
                           (cd gforth-$(VERSION); tar xf -)
                   $(TAR) gforth-$(VERSION)|gzip -9 >gforth-srconly-$(VERSION).tar.gz
                   -$(RMTREE) gforth-$(VERSION)
   
 #A document distribution contains only the documents, which can be created  #A document distribution contains only the documents, which can be created
 #with MAKE.  #with MAKE.
 docdist:        $(DOCDIST)  docdist:        $(DOCDIST)
                 -$(RMTREE) gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -rp $(DOCDIST) gforth-$(VERSION)                  $(TAR) $(DOCDIST) | (cd gforth-$(VERSION); tar xf -)
                 $(TAR) gforth-$(VERSION)|gzip -9 >gforth-doc-$(VERSION).tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-doc-$(VERSION).tar.gz
                 -$(RMTREE) gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
   
Line 289  docdist: $(DOCDIST) Line 322  docdist: $(DOCDIST)
 bindist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)  bindist:        $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)
                 -$(RMTREE) gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -rp -d $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) gforth-$(VERSION)                  $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -)
                 strip gforth-$(VERSION)/gforth                  strip gforth-$(VERSION)/gforth
                 $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz
   
Line 303  bindist: $(SOURCES) $(FORTH_GEN0) @KERNE Line 336  bindist: $(SOURCES) $(FORTH_GEN0) @KERNE
 binonlydist:    $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)  binonlydist:    $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)
                 -$(RMTREE) gforth-$(VERSION)                  -$(RMTREE) gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 $(CP) -p -d  $(BINONLYDIST) gforth-$(VERSION)                  $(TAR) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -)
                 strip gforth-$(VERSION)/gforth                  strip gforth-$(VERSION)/gforth
                 $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz                  $(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz
   
Line 314  binonlydist: $(SOURCES) $(FORTH_GEN0) @K Line 347  binonlydist: $(SOURCES) $(FORTH_GEN0) @K
 #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)
 install:        gforth $(FORTH_SRC) kernel.fi gforth.fi gforth.1 primitives gforth.TAGS installdirs  install:        gforth $(FORTH_SRC) kernel.fi gforth.fi doc/gforth.1 prim gforth.TAGS installdirs
                 touch $(datadir)/gforth/site-forth/site-init.fs                  touch $(datadir)/gforth/site-forth/siteinit.fs
                 -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)                  -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)
                 $(INSTALL_PROGRAM) -s gforth $(bindir)                  $(INSTALL_PROGRAM) -s gforth $(bindir)
                 ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)                  ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)
                 -$(INSTALL_DATA) $(srcdir)/gforth.1 $(man1dir)                  -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
                 -for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done                  -for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
                 for i in $(FORTH_SRC) primitives; do \                  for i in $(FORTH_SRC) prim; do \
                         $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \                          $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \
                 done                  done
                 $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION)
Line 348  uninstall: Line 381  uninstall:
                 @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"                  @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"
   
 check test:     gforth gforth.fi  check test:     gforth gforth.fi
                 $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye                  $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye
                 $(FORTH) other-tests.fs -e bye                  $(FORTH) test/other.fs -e bye
                 $(FORTH) code.fs checkans.fs -e bye                  $(FORTH) code.fs test/checkans.fs -e bye
                 @echo 'Expect no differences'                  @echo 'Expect no differences'
                 $(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\"' output-c process-file bye"| diff -c - $(srcdir)/primitives.i                  $(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i
   
 bench:          gforth gforth.fi  bench:          gforth 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 372  gforth-ditc: $(OBJECTS_DITC) $(OBJECTS0) Line 405  gforth-ditc: $(OBJECTS_DITC) $(OBJECTS0)
                 $(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@                  $(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 kernl16l.fi-:   $(KERN_SRC) version.fs mach16l.fs $(FORTH_GEN0)  kernl16l.fi-:   $(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach16l.fs"' main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl16b.fi-:   $(KERN_SRC) version.fs mach16b.fs $(FORTH_GEN0)  
                 $(FORTHK) -e 's" mach16b.fs"' main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"  
   
 kernl32l.fi-:   $(KERN_SRC) version.fs mach32l.fs $(FORTH_GEN0)  kernl16b.fi-:   $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32l.fs"' main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach16b.fs"' kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32b.fi-:   $(KERN_SRC) version.fs mach32b.fs $(FORTH_GEN0)  kernl32l.fi-:   $(KERN_SRC) kernel/version.fs mach32l.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32b.fs"' main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64l.fi-:   $(KERN_SRC) version.fs mach64l.fs $(FORTH_GEN0)  kernl32b.fi-:   $(KERN_SRC) kernel/version.fs mach32b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach64l.fs"' main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach32b.fs"' kernel/main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64b.fi-:   $(KERN_SRC) version.fs mach64b.fs $(FORTH_GEN0)  kernl64l.fi-:   $(KERN_SRC) kernel/version.fs mach64l.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach64b.fs"' main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach64l.fs"' kernel/main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl%.fi-:     mach%.fs $(KERN_SRC) version.fs $(FORTH_GEN0)  kernl64b.fi-:   $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" $<"' main.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach64b.fs"' kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
   
   kernl-%.fi:     arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) \
                   arch/%/prim.fs arch/%/asm.fs
                   $(FORTHK) -e 's" $<"' kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
                   if [ -f `echo $< | sed s/fs/sh/` ]; \
                   then sh `echo $< | sed s/fs/sh/` $@; \
                   else $(CP) $@- $@; \
                   fi
   
 kernl16b.fi:    $(KERNLS)  kernl16b.fi:    $(KERNLS)
                 -$(CP) kernl16b.fi kernl16b.fi~                  -$(CP) kernl16b.fi kernl16b.fi~
Line 417  kernl64l.fi: $(KERNLS) Line 455  kernl64l.fi: $(KERNLS)
                 -$(CP) kernl64l.fi kernl64l.fi~                  -$(CP) kernl64l.fi kernl64l.fi~
                 -$(CP) kernl64l.fi- kernl64l.fi                  -$(CP) kernl64l.fi- kernl64l.fi
   
 kernl%.fi:      kernl%.fi- $(KERNLS)  #kernl%.fi:     kernl%.fi- $(KERNLS)
                 -$(CP) $@ $@~  #               -$(CP) $@ $@~
                 -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      @kernel_fi@ gforth-makeimage gforth gforth-ditc $(GFORTH_FI_SRC)  gforth.fi:      @kernel_fi@ gforthmi gforth gforth-ditc $(GFORTH_FI_SRC)
                 GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i kernel.fi startup.fs" $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs                  GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i kernel.fi startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
   
 #TAGS is a GNU standard target  #TAGS is a GNU standard target
 TAGS:           gforth.TAGS  TAGS:           gforth.TAGS
                 $(CP) gforth.TAGS $@                  $(CP) gforth.TAGS $@
   
 gforth.TAGS:    @kernel_fi@ gforth $(GFORTH_FI_SRC) primitives.TAGS  gforth.TAGS:    @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS
                 $(FORTHK) etags.fs startup.fs -e bye                  $(FORTHK) etags.fs startup.fs -e bye
                 cat TAGS primitives.TAGS kernel.TAGS >gforth.TAGS                  cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS
                 rm TAGS                  rm TAGS
   
 engine.s:       engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h  engine/replace.a:
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S $(srcdir)/engine.c                  cd engine; $(MAKE) replace.a
   
 engine.o:       engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h  engine.s:       engine/engine.c engine/prim.i engine/prim_lab.i machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine.c                  $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S $(srcdir)/engine/engine.c
   
 engine-ditc.o:  engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h  engine/engine.o:        engine/engine.c engine/prim.i engine/prim_lab.i machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine.c                  $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine/engine.c -o $@
   
 main.o:         main.c machine.h threading.h $(INCLUDES) config.h version.h  engine/engine-ditc.o:   engine/engine.c engine/prim.i engine/prim_lab.i machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/main.c                  $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine/engine.c
   
 main-ditc.o:    main.c machine.h threading.h $(INCLUDES) config.h version.h  engine/main.o:          engine/main.c machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h engine/version.h
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/main.c                  $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -o $@ -c $(srcdir)/engine/main.c
   
 strtoul.o:      strtoul.c strtol.c  engine/main-ditc.o:     engine/main.c machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h engine/version.h
                   $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine/main.c
   
 primitives.b:   primitives  engine/strtoul.o:       strtoul.c strtol.c
                 m4 -s $(srcdir)/primitives >$@   
   
 primitives.i :  primitives.b prims2x.fs  prim.b:         prim
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@-                  m4 -s $(srcdir)/prim >$@ 
   
   engine/prim.i:          prim.b prims2x.fs
                   $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-c process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 prim_labels.i : primitives.b prims2x.fs  engine/prim_lab.i:      prim.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@-                  $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-label process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 aliases.fs:     primitives.b prims2x.fs aliases0.fs  kernel/aliases.fs:      prim.b prims2x.fs kernel/aliases0.fs
                 $(CP) aliases0.fs $@-                  $(CP) kernel/aliases0.fs $@-
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@-                  $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-alias process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 primitives.fs:  primitives.b prims2x.fs primitives0.fs  kernel/prim.fs: prim.b prims2x.fs kernel/prim0.fs
                 $(CP) primitives0.fs primitives.fs-                  $(CP) kernel/prim0.fs kernel/prim.fs-
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >>$@-                  $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-forth process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 primitives.TAGS: primitives.b prims2x.fs  prim.TAGS:      prim.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@-                  $(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 doc.fd:         makedoc.fs $(GFORTH_FI_SRC)  doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC)
                 $(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye                  $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs -e bye
   
 crossdoc.fd:    $(KERN_SRC) version.fs $(FORTH_GEN0)  doc/crossdoc.fd:        $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32l.fs"' main.fs -e bye                  $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye
   
 gforth.texi:    gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd  doc/gforth.texi:        doc/gforth.ds prim.b ds2texi.fs prims2x.fs \
                 $(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@-                  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" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 checkdoc:       gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs gforth.texi  checkdoc:       doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi
                 $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd answords.fs -e bye                  $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
                 -grep unknown gforth.texi                  -grep unknown doc/gforth.texi
   
 dvi:            gforth.dvi  dvi:            doc/gforth.dvi
   
 gforth.dvi gforth.fns:  gforth.texi  doc/gforth.dvi doc/gforth.fns:  doc/gforth.texi
                 $(TEXI2DVI) gforth.texi                  cd doc; $(TEXI2DVI) gforth.texi
   
 gforth.ps:      gforth.dvi  doc/gforth.ps:  doc/gforth.dvi
                 $(DVI2PS) gforth.dvi -o $@                  $(DVI2PS) doc/gforth.dvi -o $@
   
 info:           gforth.info  info:           doc/gforth.info
   
 gforth.info gforth.info-*:      gforth.texi  doc/gforth.info doc/gforth.info-*:      doc/gforth.texi
                 -$(MAKEINFO) gforth.texi                  -cd doc; $(MAKEINFO) gforth.texi
   
 html:           gforth.texi  html:           doc/gforth.texi
                 -$(RM) html/*                  -$(RM) html/*
                 -mkdir html                  -mkdir html
                 cd html; $(TEXI2HTML) -menu -split_node ../gforth.texi                  cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi
   
 doc:            gforth.ps html  doc:            doc/gforth.ps html
   
 # 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.
Line 521  $(srcdir)/configure: configure.in Line 563  $(srcdir)/configure: configure.in
                 cd $(srcdir) && autoconf                  cd $(srcdir) && autoconf
   
 # autoheader might not change config.h.in, so touch a stamp file.  # autoheader might not change config.h.in, so touch a stamp file.
 $(srcdir)/config.h.in:  stamp-h.in  config.h.in:    stamp-h.in
 $(srcdir)/stamp-h.in:   configure.in  acconfig.h  stamp-h.in:     configure.in  acconfig.h
                 cd $(srcdir) && autoheader                  cd $(srcdir) && autoheader
                 echo timestamp > $(srcdir)/stamp-h.in                  echo timestamp > $(srcdir)/stamp-h.in
   
 config.h:       stamp-h  engine/config.h:        stamp-h
 stamp-h:        config.h.in config.status  stamp-h:        config.h.in config.status
                 CONFIG_FILES=$@ CONFIG_HEADERS=config.h ./config.status                  CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status
                 echo > stamp-h                  echo > stamp-h
 Makefile:       Makefile.in config.status  Makefile:       Makefile.in config.status
                 CONFIG_FILES=$@ CONFIG_HEADERS=config.h ./config.status                  CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status
             
 config.status:  configure  config.status:  configure
                 ./config.status --recheck                  ./config.status --recheck
Line 540  config.status: configure Line 582  config.status: configure
 #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  makefile.dos: mkdosmf.sed 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
   
 makefile.os2: mkos2mf.sed Makefile.in  makefile.os2: mkos2mf.sed 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
         echo '%.o:      %.c' >>makefile.os2          echo '%.o:      %.c' >>makefile.os2
         echo '          $$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2          echo '          $$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2
           echo '%.o:      %.c' >>engine/makefile.os2
           echo '          $$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2
   
 history.dos: history.fs Makefile.in  # history is a little bit different now! JAW
         sed -e "s,~/\.gforth-history,/gforth.his,g" <history.fs >history.dos  #history.dos: history.fs Makefile.in
   #       sed -e "s,~/\.gforth-history,/gforth.his,g" <history.fs >history.dos
   
 startup.dos: startup.fs Makefile.in  startup.dos: startup.fs Makefile.in
         sed -e "s/\\\\ include doskey/include doskey/g" \          sed -e "s/\\\\ include doskey/include doskey/g" \
             -e "s/include vt100key/\\\\ include vt100key/g" <startup.fs >startup.dos              -e "s/include vt100key/\\\\ include vt100key/g" <startup.fs >startup.dos
   

Removed from v.1.99  
changed lines
  Added in v.1.100


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