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

version 1.100, 1997/05/21 20:39:15 version 1.113, 1998/07/05 20:49:58
Line 23 Line 23
 #     (which will cause the Makefiles to be regenerated when you run `make');  #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.  # (2) otherwise, pass the desired values on the `make' command line.
   
 #gforth version  # Warning:
 VERSION_MAJOR=0  # For some stupid reason setting SHELL to bash does not work properly with
 VERSION_MINOR=3  # DOS. If you want to use shell-specific things that must run with DOS make
 VERSION_RELEASE=1  # an external batch file and call it with bash (see versions.bsh).
 VERSION =$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)  
 DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE)  # ------------- gforth version
   
   VERSION = @VERSION@
   DOSVERSION=`echo $VERSION|sed 's/\.//g'`
   
   # ------------- System specific variables       
   
   machine=@machine@
   kernel_fi=@kernel_fi@
   
   # this is the type of machine
   # used to extend the include path with ./arch/$machine
   # so we can include a machine specific 
   # machine.h file
   
   PATHSEP = @PATHSEP@
   
   osclass = @OSCLASS@
   
   # ------------- Utility programs
   
 SHELL   = /bin/sh  SHELL   = /bin/sh
 RM      = rm  RM      = rm
 RMTREE  = rm -rf  RMTREE  = rm -rf
Line 40  INSTALL_DATA = @INSTALL_DATA@ Line 60  INSTALL_DATA = @INSTALL_DATA@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 GCC     = @CC@  GCC     = @CC@
 CC      = $(GCC)  CC      = $(GCC)
 PATHSEP = @PATHSEP@  FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP).  
 FORTHSIZES = @FORTHSIZES@  FORTHSIZES = @FORTHSIZES@
 FORTH   = ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir)  FORTH   = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
 FORTHKFLAGS= -p .$(PATHSEP)$(srcdir) -i ./kernel.fi  FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$(srcdir) -i ./$(kernel_fi)
 FORTHK  = ./gforth $(FORTHKFLAGS)  FORTHK  = ./gforth $(FORTHKFLAGS)
 FORTHP  = ./gforth -i ./kernel.fi  FORTHP  = ./gforth --die-on-signal -i ./$(kernel_fi)
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi  TEXI2DVI = texi2dvi
 DVI2PS  = dvips -D300  DVI2PS  = dvips -D300
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/  #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 TEXI2HTML = texi2html  TEXI2HTML = texi2html
 MAKEINFO = makeinfo  MAKEINFO = makeinfo
   
   # ------------- Compiler Flags
   
 XCFLAGS = @CFLAGS@  XCFLAGS = @CFLAGS@
 XDEFINES = @DEFS@  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) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\"  CFLAGS  = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -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 66  GCCLDFLAGS = @GCCLDFLAGS@ Line 88  GCCLDFLAGS = @GCCLDFLAGS@
 LDFLAGS =  $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS)  LDFLAGS =  $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS)
 LDLIBS  = @LIBS@  LDLIBS  = @LIBS@
   
   # ------------  Install Directorys
   
 VPATH = @srcdir@  VPATH = @srcdir@
 prefix = @prefix@  prefix = @prefix@
 exec_prefix = @exec_prefix@  exec_prefix = @exec_prefix@
Line 80  mandir = $(prefix)/man Line 104  mandir = $(prefix)/man
 man1dir= $(mandir)/man1  man1dir= $(mandir)/man1
 man1ext= .1  man1ext= .1
 #older emacses have their site-lisp in $(libdir)/emacs/  #older emacses have their site-lisp in $(libdir)/emacs/
 emacssitelispdir=$(datadir)/emacs/site-lisp  emacssitelispdir=@lispdir@
   
 INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h  INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h
   
Line 106  KERN_SRC = \ Line 130  KERN_SRC = \
         kernel/vars.fs \          kernel/vars.fs \
         kernel/accept.fs \          kernel/accept.fs \
         kernel/basics.fs \          kernel/basics.fs \
         kernel/interp.fs \          kernel/int.fs \
           kernel/comp.fs \
         kernel/io.fs \          kernel/io.fs \
         kernel/license.fs \          kernel/license.fs \
         kernel/nio.fs \          kernel/nio.fs \
         kernel/saccept.fs          kernel/saccept.fs \
           kernel/doers.fs \
           kernel/getdoers.fs
   
   EC_SRC = \
           asm/00-readme \
           asm/bitmask.fs \
           asm/numref.fs \
           asm/basic.fs \
           asm/generic.fs \
           asm/target.fs \
           ec/00-readme \
           ec/mirror.fs \
           ec/mirrors.fs \
           ec/shex.fs \
           ec/builttag.fs \
           ec/dotx.fs \
           ec/mirrored.fs \
           ec/nesting.fs
   
 GFORTH_FI_SRC = \  GFORTH_FI_SRC = \
         assert.fs \          assert.fs \
Line 128  GFORTH_FI_SRC = \ Line 171  GFORTH_FI_SRC = \
         hash.fs \          hash.fs \
         history.fs \          history.fs \
         intcomp.fs \          intcomp.fs \
           locals.fs \
         look.fs \          look.fs \
         search.fs \          search.fs \
         see.fs \          see.fs \
Line 140  GFORTH_FI_SRC = \ Line 184  GFORTH_FI_SRC = \
         termsize.fs \          termsize.fs \
         vt100.fs \          vt100.fs \
         vt100key.fs \          vt100key.fs \
         wordinfo.fs          wordinfo.fs \
           lib.fs \
           sieve.fs \
           add.fs
   
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_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 \
Line 162  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 209  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 COMPAT  = compat/CVS compat/README compat/control.fs compat/anslocal.fs \  COMPAT  = compat/CVS compat/README compat/control.fs compat/anslocal.fs \
         compat/struct.fs compat/loops.fs          compat/struct.fs compat/loops.fs
   
   GFORTH_TEXI =  doc/gforth.texi doc/version.texi
   
 ALLSUBDIRS = engine  ALLSUBDIRS = engine
   
   ARCHS = arch/generic/machine.h \
           arch/m68k/machine.h \
           arch/mips/machine.h \
           arch/386/machine.h \
           arch/hppa/machine.h \
           arch/sparc/machine.h \
           arch/power/machine.h \
           arch/alpha/machine.h \
           arch/4stack/README \
           arch/4stack/asm.fs \
           arch/4stack/mach.fs \
           arch/4stack/prim.fs \
           arch/4stack/mach.sh \
           arch/4stack/relocate.fs \
           arch/misc/README \
           arch/misc/asm.fs \
           arch/misc/mach.fs \
           arch/misc/prim.fs \
           arch/misc/sim.fs \
           arch/misc/sokoban.fs \
           arch/misc/tt.fs \
           arch/6502/asm.fs \
           arch/6502/prim.fs \
           arch/6502/mach.fs \
           arch/6502/zero.fs \
           arch/6502/softuart.fs \
           arch/6502/cold.fs \
           arch/8086/asm.fs \
           arch/8086/mach.fs \
           arch/8086/mach.sh \
           arch/8086/prim.fs \
           arch/avr/asm.fs \
           arch/c165/asm.fs \
           arch/c165/mach.fs \
           arch/c165/prim.fs \
           arch/h8/asm.fs \
           arch/shboom/asm.fs \
           arch/shboom/compiler.fs \
           arch/shboom/dis.fs \
           arch/shboom/mach.fs \
           arch/shboom/prim.fs \
           arch/shboom/dis2.fs \
           arch/shboom/sh.p \
           arch/shboom/doers.fs
   
 SOURCES = CVS compat Makefile.in engine/Makefile.in gforthmi \  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 engine/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 INSTALL.BINDIST NEWS README ToDo BUGS model \
           COPYING Benchres aclocal.m4 \
         doc/gforth.ds doc/texinfo.tex doc/gforth.1 gforth.el \          doc/gforth.ds doc/texinfo.tex doc/gforth.1 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 \
         arch/m68k/machine.h arch/mips/machine.h arch/386/machine.h \          $(ARCHS) \
         arch/hppa/machine.h arch/sparc/machine.h arch/power/machine.h \  
         arch/alpha/machine.h \  
         engine/cache.c engine/32bit.h \          engine/cache.c engine/32bit.h \
         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/pow10.c engine/atanh.c engine/cleanalign.c \
         engine/strerror.c engine/strsignal.c engine/strsig.c engine/dblsub.c \          engine/strerror.c engine/strsignal.c engine/strsig.c engine/dblsub.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 startup.dos history.dos mkinstalldirs \          dosconf.h gforthmi.bat startup.dos history.dos mkinstalldirs \
         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) \
           testclean testdist testdist1 timings.sc
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 GEN = gforth gforth-ditc kernel/version.fs version-stamp  GEN = gforth gforth-ditc kernel/version.fs version-stamp
   
 OBJECTS0 = engine/replace.a  
 OBJECTS = engine/engine.o engine/main.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 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.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
Line 205  DOCDIST = doc/gforth.info doc/gforth.inf Line 295  DOCDIST = doc/gforth.info doc/gforth.inf
 #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/machine.h engine/config.h kernel.fi \          arch/$(machine)/machine.h engine/config.h engine/Makefile \
         stamp-h engine/version.h kernel/version.fs version-stamp \          stamp-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) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile configure  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile engine/Makefile configure
   
 #standards.info recommends this:  #standards.info recommends this:
 .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,...
   FORCE: ;
   
 #this rule avoids remaking everything after minor changes in Makefile.in  #this rule avoids remaking everything after minor changes in Makefile.in
 version:        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
   
 engine/version.h:       version  # With dos we use normal dos echo
                 echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@  # we cannot pipe the output to engine/version.h directly because
   # of the "/ and \" problem. Copying works because we use the
   # shell und file utilities.
   
 kernel/version.fs:      version  kernel/version.fs:      version
                 $(MAKE) gforth          $(MAKE) gforth
                 echo ": version-string s\" $(VERSION)\" ;" >$@          $(SHELL) versions.bsh $(VERSION)
   
 more:   $(OBJECTS) $(FORTH_GEN) gforth  more:   engine $(FORTH_GEN) gforth
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 245  more: $(OBJECTS) $(FORTH_GEN) gforth Line 341  more: $(OBJECTS) $(FORTH_GEN) gforth
 # `distclean' also deletes the files made by config.  # `distclean' also deletes the files made by config.
 # `realclean' also deletes everything that could be regenerated automatically."  # `realclean' also deletes everything that could be regenerated automatically."
   
 mostlyclean:  mostlyclean:    FORCE
                 -$(RM) -rf *.s gforth.fi *.fi~ *.fi- kernel/version.fs *TAGS \                  -$(RM) -rf *.s gforth.fi *.fi~ *.fi- kernel/version.fs *TAGS \
                 doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \                  doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \
                 doc/gforth.aux doc/gforth.cp doc/gforth.cps \                  doc/gforth.aux doc/gforth.cp doc/gforth.cps \
                 doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \                  doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \
                 doc/gforth.pg \                  doc/gforth.pg \
                 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
                 engine/version.h  
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) *.o engine/*.o engine/*.a                  -$(RM) -rf $(GEN) *.o engine/*.o engine/*.a
   
 distclean:      clean  distclean:      clean
                 -$(RM) machine/machine.h kernel.fi config.cache config.log \                  -$(RM) config.cache config.log \
                 config.status engine/config.h Makefile stamp-h                  config.status engine/config.h Makefile engine/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 347  binonlydist: $(SOURCES) $(FORTH_GEN0) @K Line 442  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 doc/gforth.1 prim gforth.TAGS installdirs  install:        gforth $(FORTH_SRC) $(kernel_fi) gforth.fi doc/gforth.1 prim gforth.TAGS installdirs
                 touch $(datadir)/gforth/site-forth/siteinit.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)
Line 357  install: gforth $(FORTH_SRC) kernel.fi g Line 452  install: gforth $(FORTH_SRC) kernel.fi g
                 for i in $(FORTH_SRC) prim; 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) $(datadir)/gforth/$(VERSION)
                 $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names                  $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names
                 $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
                 sed 's:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)                  sed 's:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)
                 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
                 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."
   
 install-strip:  install  install-strip:  install
Line 376  installdirs: mkinstalldirs Line 471  installdirs: mkinstalldirs
   
 #deinstall all files specific to this version of gforth  #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'  #to uninstall version foo, type `make uninstall VERSION=foo'
 uninstall:        uninstall:      FORCE
                 -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)                  -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)
                 @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"
   
Line 385  check test: gforth gforth.fi Line 480  check test: gforth gforth.fi
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 $(FORTH) code.fs test/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)/prim.b\"' output-c process-file bye"| 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 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 394  bench:  gforth gforth.fi Line 489  bench:  gforth gforth.fi
                 time $(FORTH) -m 160000 matrix.fs -e "main bye"                  time $(FORTH) -m 160000 matrix.fs -e "main bye"
                 time $(FORTH) fib.fs -e "main bye"                  time $(FORTH) fib.fs -e "main bye"
   
 dvi:            gforth.dvi  # ------------- Make forth images
   
 gforth:         $(OBJECTS) $(OBJECTS0)  
                 -$(CP) gforth gforth~  
                 $(GCC) $(LDFLAGS) $(OBJECTS) $(OBJECTS0) $(LDLIBS) -o $@  
                 @GFORTH_EXE@  
   
 gforth-ditc:    $(OBJECTS_DITC) $(OBJECTS0)  # Hot to make new images:
                 $(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@  # 1. Produce an image called kernlXYZ.fi-
                 @GFORTHDITC_EXE@  #    the original kernel.fi is not touched because it's needed for creation
   # 2. copy old kernlXYZ.fi to kernlXYZ.fi~
   #    that's a backup copy in case the new kernels don't work
   # 3. copy new kernels to kernlXYZ.fi
   #    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"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
Line 459  kernl64l.fi: $(KERNLS) Line 553  kernl64l.fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      @kernel_fi@ gforthmi 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)/gforthmi 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  # ------------- Make c-engine
 TAGS:           gforth.TAGS  
                 $(CP) gforth.TAGS $@  
   
 gforth.TAGS:    @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS  
                 $(FORTHK) etags.fs startup.fs -e bye  
                 cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS  
                 rm TAGS  
   
 engine/replace.a:  
                 cd engine; $(MAKE) replace.a  
   
 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) -S $(srcdir)/engine/engine.c  
   
 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) -c $(srcdir)/engine/engine.c -o $@  
   
 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) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine/engine.c  
   
 engine/main.o:          engine/main.c machine/machine.h engine/threaded.h $(INCLUDES) engine/config.h engine/version.h  
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -o $@ -c $(srcdir)/engine/main.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  
   
 engine/strtoul.o:       strtoul.c strtol.c  
   
 prim.b:         prim  prim.b:         prim
                 m4 -s $(srcdir)/prim >$@                   m4 -s $(srcdir)/prim >$@ 
Line 516  kernel/prim.fs: prim.b prims2x.fs kernel Line 583  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
   gforth:         FORCE
                   -$(CP) gforth gforth~
                   cd engine; make gforth; cd ..
                   $(CP) engine/$@ $@
                   @GFORTH_EXE@
   
   gforth-ditc:    FORCE
                   cd engine; make gforth-ditc; cd ..
                   $(CP) engine/$@ $@
                   @GFORTHDITC_EXE@
   
   # ------------- additional C primitives
   
   %.c:            %.pri prim2cl.fs
                   $(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@
   
   %.so:           %.c
                   $(GCC) -shared $(CFLAGS) $< -o $@
   
   # ------------- Make Documentation
   
   #TAGS is a GNU standard target
   TAGS:           gforth.TAGS
                   $(CP) gforth.TAGS $@
   
   gforth.TAGS:    @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS
                   $(FORTHK) etags.fs startup.fs -e bye
                   cat TAGS prim.TAGS kernel.TAGS >gforth.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" >$@-                  $(FORTHK) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC)  doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs
                 $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs -e bye                  $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.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
Line 539  checkdoc: doc/gforth.ds prim.b ds2texi.f Line 636  checkdoc: doc/gforth.ds prim.b ds2texi.f
   
 dvi:            doc/gforth.dvi  dvi:            doc/gforth.dvi
   
 doc/gforth.dvi doc/gforth.fns:  doc/gforth.texi  doc/gforth.dvi doc/gforth.fns:  $(GFORTH_TEXI)
                 cd doc; $(TEXI2DVI) gforth.texi                  cd doc; $(TEXI2DVI) gforth.texi
   
 doc/gforth.ps:  doc/gforth.dvi  doc/gforth.ps:  doc/gforth.dvi
Line 547  doc/gforth.ps: doc/gforth.dvi Line 644  doc/gforth.ps: doc/gforth.dvi
   
 info:           doc/gforth.info  info:           doc/gforth.info
   
 doc/gforth.info doc/gforth.info-*:      doc/gforth.texi  doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)
                 -cd doc; $(MAKEINFO) gforth.texi                  -cd doc; $(MAKEINFO) gforth.texi
   
 html:           doc/gforth.texi  html:           $(GFORTH_TEXI)
                 -$(RM) html/*                  -$(RM) html/*
                 -mkdir html                  -mkdir html
                 cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi                  cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi
Line 559  doc:  doc/gforth.ps html Line 656  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.
 $(srcdir)/configure:    configure.in   $(srcdir)/configure:    configure.in aclocal.m4
                 cd $(srcdir) && autoconf                  cd $(srcdir) && autoconf
   
   aclocal.m4:     acinclude.m4 configure.in
                   aclocal
   
 # autoheader might not change config.h.in, so touch a stamp file.  # autoheader might not change config.h.in, so touch a stamp file.
 config.h.in:    stamp-h.in  config.h.in:    stamp-h.in
 stamp-h.in:     configure.in  acconfig.h  stamp-h.in:     configure.in  acconfig.h
Line 572  engine/config.h: stamp-h Line 672  engine/config.h: stamp-h
 stamp-h:        config.h.in config.status  stamp-h:        config.h.in config.status
                 CONFIG_FILES=$@ CONFIG_HEADERS=engine/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=engine/config.h ./config.status                  CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
   
   engine/Makefile: engine/Makefile.in config.status
                   CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
             
 config.status:  configure  config.status:  configure
                 ./config.status --recheck                  ./config.status --recheck
   
   
 #create files for DOS, because DOS cannot do it itself  #create files for DOS, because DOS cannot do it itself
 makefile.dos: mkdosmf.sed Makefile.in  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  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
Line 592  makefile.os2: mkos2mf.sed Makefile.in Line 696  makefile.os2: mkos2mf.sed Makefile.in
         echo '%.o:      %.c' >>engine/makefile.os2          echo '%.o:      %.c' >>engine/makefile.os2
         echo '          $$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2          echo '          $$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2
   
   # Garbage:
   # to be deleted!
   
 # history is a little bit different now! JAW  # history is a little bit different now! JAW
 #history.dos: history.fs Makefile.in  # history.dos: history.fs Makefile.in
 #       sed -e "s,~/\.gforth-history,/gforth.his,g" <history.fs >history.dos  #       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.100  
changed lines
  Added in v.1.113


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