Diff for /gforth/Makefile.in between versions 1.212 and 1.220

version 1.212, 2001/12/24 20:39:29 version 1.220, 2002/04/01 15:34:34
Line 64  GCC = @CC@ Line 64  GCC = @CC@
 CC      = $(GCC)  CC      = $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)  FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@  FORTHSIZES = @FORTHSIZES@
 FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)  FORTHS_ARGS =  -p $(FORTHPATH)$(PATHSEP)$(srcdir)
   FORTH_ARGS = --die-on-signal $(FORTHS_ARGS)
 ENGINE = ./gforth  ENGINE = ./gforth
 FORTH   = $(ENGINE) $(FORTH_ARGS)  FORTH   = $(ENGINE) $(FORTH_ARGS)
   FORTHS  = $(ENGINE) $(FORTHS_ARGS)
 # the (existing) forth system to use for cross compiling and primitives tables  # the (existing) forth system to use for cross compiling and primitives tables
 # per default we use the one in this directory for a rebuild. It is also  # per default we use the one in this directory for a rebuild. It is also
 # possible to override this variable at the command line for an initial build (jaw)  # possible to override this variable at the command line for an initial build (jaw)
 BUILDFORTH = $(ENGINE) --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)  BUILDFORTH = $(ENGINE) --die-on-signal -m 4M -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 # the forth system plus flags we use to build  # the forth system plus flags we use to build
 FORTHB = $(BUILDFORTH) -m 1000000 -e 'fpath= .|~+|$(srcdir)'  FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs  # the Forth system for running prims2x.fs
 FORTHP = $(FORTHB)  FORTHP = $(FORTHB)
 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)" -m 1000000 -i $(kernel_fi)  FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 FORTHK  = $(ENGINE) $(FORTHKFLAGS)  FORTHK  = $(ENGINE) $(FORTHKFLAGS)
 #FORTHP = $(ENGINE) --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  #the "-2 image-included-files +!" undoes the change to image-included-files
Line 235  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 237  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         tt.fs sokoban.fs \          tt.fs sokoban.fs \
         unbuffer.fs wordsets.fs \          unbuffer.fs wordsets.fs \
         test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \          test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
         test/string.fs test/other.fs test/checkans.fs \          test/string.fs test/other.fs test/signals.fs test/checkans.fs \
         bubble.fs siev.fs matrix.fs fib.fs \          bubble.fs siev.fs matrix.fs fib.fs \
         oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \          oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
         moofglos.fs fixpath.fs \          moofglos.fs fixpath.fs \
Line 349  SOURCES = $(CVSDIRS) compat Makefile.in Line 351  SOURCES = $(CVSDIRS) compat Makefile.in
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-prof$(EXE) kernel/version.fs  GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-prof$(EXE) kernel/version.fs
   
 # things that need a working forth system to be generated  # things that need a working forth system to be generated
 FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i engine/prim_superend.i engine/peephole.i engine/profile.i kernel/aliases.fs kernel/prim.fs  FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i engine/prim_superend.i engine/peephole.i engine/profile.i
   FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) 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@ 
Line 389  kernel/version.fs: version Line 392  kernel/version.fs: version
         $(MAKE) gforth$(EXE)          $(MAKE) gforth$(EXE)
         echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   engine $(FORTH_GEN) $(GEN)  more:   engines $(FORTH_GEN) $(GEN)
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 422  docclean: FORCE Line 425  docclean: FORCE
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) engine/gforth$(EXE) \                  -$(RM) -rf $(GEN) engine/gforth$(EXE) \
                 engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \                  engine/gforth-fast$(EXE) engine/gforth-itc$(EXE) \
                   engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \
                 *.o engine/*.o arch/*/*.o version                  *.o engine/*.o arch/*/*.o version
   
 distclean:      clean  distclean:      clean
Line 528  uninstall: FORCE Line 532  uninstall: FORCE
 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 test/string.fs -e bye | diff -c - $(srcdir)/test/coretest.out                  $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs -e bye | diff -c - $(srcdir)/test/coretest.out
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                   $(FORTHS) test/signals.fs -e bye
                 $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out                  $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out
                 $(FORTH) -m 100000 prims2x.fs -e \                  $(FORTH) prims2x.fs -e \
                   "c-flag on s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \                    "c-flag on s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
                   diff -c - $(srcdir)/engine/prim.i                    diff -c - $(srcdir)/engine/prim.i
   
Line 537  bench:  gforth-fast$(EXE) gforth.fi Line 542  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)'
                 time $(FORTH_FAST) siev.fs -e "main bye"                  time $(FORTH_FAST) siev.fs -e "main bye"
                 time $(FORTH_FAST) bubble.fs -e "main bye"                  time $(FORTH_FAST) bubble.fs -e "main bye"
                 time $(FORTH_FAST) --dictionary-size 1M matrix.fs -e "main bye"                  time $(FORTH_FAST) matrix.fs -e "main bye"
                 time $(FORTH_FAST) fib.fs -e "main bye"                  time $(FORTH_FAST) fib.fs -e "main bye"
   
 # ------------- Make forth images  # ------------- Make forth images
Line 606  kernl64l.fi: $(KERNLS) Line 611  kernl64l.fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC)  gforth.fi:      $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC) comp-i.fs
                 GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)                  GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
Line 624  engine/prim_lab.i: prim.b prims2x.fs Line 629  engine/prim_lab.i: prim.b prims2x.fs
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
   engine/prim_names.i:    prim.b prims2x.fs
                   $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-forthname dup process-file bye" >$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
 engine/prim_superend.i: prim.b prims2x.fs  engine/prim_superend.i: prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-superend dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
Line 635  engine/peephole.i: prim.b prims2x.fs Line 645  engine/peephole.i: prim.b prims2x.fs
                 $(RM) $@-                  $(RM) $@-
   
 engine/profile.i:       prim.b prims2x.fs  engine/profile.i:       prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-profile ' output-profile-combined process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 665  gforth-fast$(EXE): engines Line 675  gforth-fast$(EXE): engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHFAST_EXE@                  @GFORTHFAST_EXE@
   
   gforth-itc$(EXE):       engines
                   $(CP) engine/$@ $@
                   @GFORTHITC_EXE@
   
 gforth-ditc$(EXE):      engines  gforth-ditc$(EXE):      engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
Line 672  gforth-ditc$(EXE): engines Line 686  gforth-ditc$(EXE): engines
 gforth-prof$(EXE):      engines  gforth-prof$(EXE):      engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
   
 engines:        FORCE engine/Makefile engine/prim.i engine/prim_lab.i engine/peephole.i engine/profile.i  gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
                 cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)  
   engines:        FORCE $(FORTH_GEN_ENGINE) engine/Makefile
                   cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
Line 740  doc/gforth.texi: doc/gforth.ds prim.b ds Line 756  doc/gforth.texi: doc/gforth.ds prim.b ds
                 $(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
                 $(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                  $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
                 -grep unknown doc/gforth.texi                  -grep unknown doc/gforth.texi
   
 dvi:            doc/gforth.dvi  dvi:            doc/gforth.dvi

Removed from v.1.212  
changed lines
  Added in v.1.220


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