Diff for /gforth/Makefile.in between versions 1.205 and 1.209

version 1.205, 2001/04/30 13:48:56 version 1.209, 2001/05/13 10:54:10
Line 68  FORTH_ARGS = --die-on-signal -p $(FORTHP Line 68  FORTH_ARGS = --die-on-signal -p $(FORTHP
 ENGINE = ./gforth  ENGINE = ./gforth
 FORTH   = $(ENGINE) $(FORTH_ARGS)  FORTH   = $(ENGINE) $(FORTH_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
 BUILDFORTH = $(FORTHK)  # 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)
   BUILDFORTH = $(ENGINE) --die-on-signal -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) -m 1000000 -e 'fpath= .|~+|$(srcdir)'
   # the Forth system for running prims2x.fs
   FORTHP = $(FORTHB) startup.fs
 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)" -m 1000000 -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
 # in exboot.fs  # in exboot.fs
 STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@  STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
Line 205  GFORTH_FI_SRC = \ Line 209  GFORTH_FI_SRC = \
         search.fs \          search.fs \
         see.fs \          see.fs \
         see-ext.fs \          see-ext.fs \
           simp-see.fs \
         source.fs \          source.fs \
         startup.fs \          startup.fs \
         struct.fs \          struct.fs \
Line 308  ARCHS = \ Line 313  ARCHS = \
         arch/sharc/types.h \          arch/sharc/types.h \
         arch/sharc/g21k-3.3.4-bp1.diff          arch/sharc/g21k-3.3.4-bp1.diff
   
 SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in gforthmi.in \  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
           vmgen-ex/engine.c vmgen-ex/fib.mini \
           vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \
           vmgen-ex/mini.l vmgen-ex/mini.y vmgen-ex/peephole-blacklist \
           vmgen-ex/peephole.c vmgen-ex/profile.c vmgen-ex/seq2rule.awk \
           vmgen-ex/simple.mini vmgen-ex/stat.awk vmgen-ex/support.c \
           vmgen-ex/test.mini vmgen-ex/test.out
   
   SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \
           gforthmi.in vmgen.in README.vmgen \
         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 \
         iss.sh 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 peeprules.vmg engine/engine.c engine/main.c \
         engine/signals.c $(ARCHS) \          engine/io.c engine/memcmpc.c engine/signals.c $(ARCHS) \
           engine/peephole.c engine/profile.c \
         engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \          engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
         engine/ecvt.c engine/memcmp.c engine/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 \
Line 328  SOURCES = $(CVSDIRS) compat Makefile.in Line 343  SOURCES = $(CVSDIRS) compat Makefile.in
         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) $(VMGEN_EX) \
         timings.sc \          timings.sc \
         test/coretest.out test/checkans.out          test/coretest.out test/checkans.out
   
Line 362  all: kernel/version.fs more Line 377  all: kernel/version.fs more
 FORCE: ;  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 configure.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
   
 # With dos we use normal dos echo  # With dos we use normal dos echo
Line 414  distclean: clean Line 429  distclean: clean
                 -$(RM) config.cache config.log config.status \                  -$(RM) config.cache config.log config.status \
                 engine/config.h Makefile Makedist engine/Makefile \                  engine/config.h Makefile Makedist engine/Makefile \
                 stamp-h engine/stamp-h \                  stamp-h engine/stamp-h \
                 doc/version.texi gforthmi                  doc/version.texi gforthmi vmgen
   
 #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 461  binonlydist: Makedist FORCE Line 476  binonlydist: Makedist FORCE
 #hard to generate).  #hard to generate).
 #we rebuild gforth.fi, because it contains some path names.  #we rebuild gforth.fi, because it contains some path names.
 #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.  #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 vmgen 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 $(bindir)/vmgen
                 -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)                  -$(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)
                 (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) 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)
                 (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) 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)
                   $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION)
                 $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)                  $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)
                 (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)                  (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
                   (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)
                 -$(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 \
Line 505  installdirs: mkinstalldirs Line 522  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:      FORCE  uninstall:      FORCE
                 -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(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) (bindir)/vmgen-$(VERSION)
                 @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"                  @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforth-fast$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(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 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
Line 520  bench:  gforth-fast$(EXE) gforth.fi Line 537  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) -m 200000 matrix.fs -e "main bye"                  time $(FORTH_FAST) --dictionary-size 1M 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 594  gforth.fi: $(kernel_fi) gforthmi gforth$ Line 611  gforth.fi: $(kernel_fi) gforthmi gforth$
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
 prim.b:         prim  prim.b:         prim peeprules.vmg
                 m4 -s $(srcdir)/prim >$@                   m4 -s $(srcdir)/prim >$@ 
   
 engine/prim.i:          prim.b prims2x.fs  engine/prim.i:          prim.b prims2x.fs
                 $(FORTHB) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-                  $(FORTHP) 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
                 $(FORTHB) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label dup process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 engine/peephole.i:      prim.b prims2x.fs  engine/peephole.i:      prim.b prims2x.fs
                 $(FORTHB) prims2x.fs -e "c-flag on s\" prim.b\" ' noop ' output-peephole process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop ' output-peephole process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 engine/profile.i:       prim.b prims2x.fs  engine/profile.i:       prim.b prims2x.fs
                 $(FORTHB) 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 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 $@-
                 $(FORTHB) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias dup process-file bye" >>$@-                  $(FORTHP) 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-
                 $(FORTHB) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@-                  $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 kernel/peephole.fs:     prim.b prims2x.fs  kernel/peephole.fs:     prim.b prims2x.fs
                 $(FORTHB) prims2x.fs -e "forth-flag on s\" prim.b\" ' noop ' output-forth-peephole process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' noop ' output-forth-peephole process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 678  gforth.TAGS: @kernel_fi@ gforth$(EXE) $( Line 695  gforth.TAGS: @kernel_fi@ gforth$(EXE) $(
 prim.TAGS:      prim.b prims2x.fs  prim.TAGS:      prim.b prims2x.fs
                 #echo '2c\' >prim.TAGS.sed                  #echo '2c\' >prim.TAGS.sed
                 #echo $(srcdir)/prim >>prim.TAGS.sed                  #echo $(srcdir)/prim >>prim.TAGS.sed
                 #$(FORTHB) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@-                  #$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@-
                 $(FORTHB) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 694  doc/crossdoc.fd: $(KERN_SRC) kernel/vers Line 711  doc/crossdoc.fd: $(KERN_SRC) kernel/vers
   
 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
                 $(FORTHB) 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" >$@-                  $(FORTHP) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 749  stamp-h: engine/config.h.in config.statu Line 766  stamp-h: engine/config.h.in config.statu
                 CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status                  CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status
                 echo timestamp > stamp-h                  echo timestamp > stamp-h
   
 Makefile Makedist engine/Makefile gforthmi machpc.fs:   Makefile.in Makedist.in engine/Makefile.in gforthmi.in machpc.fs.in config.status  Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs:     Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in config.status
                 CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./config.status                  CONFIG_FILES="$@" CONFIG_HEADERS=engine/config.h ./config.status
   
 config.status:  configure  config.status:  configure

Removed from v.1.205  
changed lines
  Added in v.1.209


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