Diff for /gforth/Makefile.in between versions 1.244 and 1.255

version 1.244, 2003/01/10 21:43:41 version 1.255, 2003/02/06 16:50:32
Line 37  DOSVERSION=`echo $(VERSION)|sed 's/\.//g Line 37  DOSVERSION=`echo $(VERSION)|sed 's/\.//g
   
 machine=@machine@  machine=@machine@
 kernel_fi=@kernel_fi@  kernel_fi=@kernel_fi@
 EXE=@EXE@  EXE=@EXEEXT@
   
 # this is the type of machine  # this is the type of machine
 # used to extend the include path with ./arch/$machine  # used to extend the include path with ./arch/$machine
Line 74  FORTHS = $(ENGINE) $(FORTHS_ARGS) Line 74  FORTHS = $(ENGINE) $(FORTHS_ARGS)
 # 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 -m 4M -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) -e 'fpath= .|~+|$(srcdir)'  FORTHB = $(BUILDFORTH) -e 'fpath= .|~+|$(srcdir)' except.fs
 # the Forth system for running prims2x.fs  # the Forth system for running prims2x.fs
 FORTHP = $(FORTH)  FORTHP = $(FORTH)
 ENGINE_FAST = $(ENGINE)-fast  ENGINE_FAST = $(ENGINE)-fast
Line 240  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 240  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/float.fs \          test/string.fs test/float.fs test/gforth.fs \
         test/other.fs test/signals.fs test/checkans.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 \
Line 336  SOURCES = $(CVSDIRS) compat Makefile.in Line 336  SOURCES = $(CVSDIRS) compat Makefile.in
         gforthmi.in vmgen.in README.vmgen NEWS.vmgen \          gforthmi.in vmgen.in README.vmgen NEWS.vmgen \
         configure.in configure config.sub config.guess elisp-comp missing \          configure.in configure config.sub config.guess elisp-comp missing \
         engine/config.h.in stamp-h.in \          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 \
           BUILD-FROM-SCRATCH model \
         COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \          COPYING COPYING.DOC 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 \
         doc/vmgen.texi doc/fdl.texi \          doc/vmgen.texi doc/fdl.texi \
         gforth.el \          gforth.el \
         prim peeprules.vmg engine/engine.c engine/main.c \          prim peeprules.vmg engine/engine.c engine/main.c \
         engine/io.c engine/support.c engine/memcmpc.c engine/signals.c \          engine/io.c engine/support.c engine/signals.c \
         $(ARCHS) \          $(ARCHS) \
         engine/profile.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 \
Line 368  GEN = gforth$(EXE) gforth-ditc$(EXE) gfo Line 369  GEN = gforth$(EXE) gforth-ditc$(EXE) gfo
 # things that need a working forth system to be generated  # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \  FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
         engine/prim_superend.i engine/profile.i \          engine/prim_superend.i engine/profile.i \
         engine/prim_num.i engine/prim_grp.i \          engine/prim_num.i engine/prim_grp.i
         engine/config.h  
 FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.fs  FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs kernel/groups.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,
Line 505  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 505  install: gforth$(EXE) $(FORTH_SRC) $(ker
                 touch $(siteforthdir)/siteinit.fs                  touch $(siteforthdir)/siteinit.fs
                 -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi $(bindir)/vmgen                  -$(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)
                   -$(RM) $(bindir)/gforth-itc$(EXE) $(bindir)/gforth-itc-$(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) -s gforth-itc$(EXE) $(bindir)/gforth-itc-$(VERSION)$(EXE)
                   (cd $(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE))
                 $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)                  $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
                 $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION)                  $(INSTALL_PROGRAM) vmgen $(bindir)/vmgen-$(VERSION)
                 $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)                  $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)
Line 547  installdirs: mkinstalldirs Line 550  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) (bindir)/vmgen-$(VERSION)                  -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-itc-$(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 $(bindir)/vmgen $(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)/gforth-itc$(EXE) $(bindir)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth"
   
 check:          gforths gforth.fi  check:          gforths gforth.fi
                 $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1
Line 560  check:  gforths gforth.fi Line 563  check:  gforths gforth.fi
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
   
 checkone test:  gforth$(EXE) gforth.fi  checkone test:  gforth$(EXE) gforth.fi
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.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 test/float.fs test/gforth.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 $(FORTHS) test/signals.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 | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
                 $(FORTH) prims2x.fs -e \                  $(FORTH) prims2x.fs -e \
                   "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \                    "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
                   diff -c - $(srcdir)/engine/prim.i                    tr -d '\015' | diff -c - $(srcdir)/engine/prim.i
   
 bench:          gforth-fast$(EXE) gforth.fi  bench:          gforth-fast$(EXE) gforth.fi
                 @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'                  @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
Line 623  kernl64l.fi-: $(KERN_DEPS) mach64l.fs Line 626  kernl64l.fi-: $(KERN_DEPS) mach64l.fs
 kernl64b.fi-:   $(KERN_DEPS) mach64b.fs  kernl64b.fi-:   $(KERN_DEPS) mach64b.fs
                 $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl-%.fi:     arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  #Solaris make does not like that:
                 $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"  #kernl-%.fi:    arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 if [ -f `echo $< | sed s/fs/sh/` ]; \  #               $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
                 then sh `echo $< | sed s/fs/sh/` $@; \  #               if [ -f `echo $< | sed s/fs/sh/` ]; \
                 else $(CP) $@- $@; \  #               then sh `echo $< | sed s/fs/sh/` $@; \
                 fi  #               else $(CP) $@- $@; \
   #               fi
   
 #SunOS make does not like that  #SunOS make does not like that
 #arch/%/mach.fs:        arch/%/prim.fs arch/%/asm.fs  #arch/%/mach.fs:        arch/%/prim.fs arch/%/asm.fs
Line 722  kernel/prim.fs: prim.b prims2x.fs kernel Line 726  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(RM) $@-                  $(RM) $@-
   
 kernel/groups.fs:       engine/prim_grp.i  kernel/groups.fs:       engine/prim_grp.i
         grep GROUP $< | cut -f2 -d, | sed -e 's/)/ ,/g' >$@          grep GROUP engine/prim_grp.i | cut -f2 -d, | sed -e 's/)/ ,/g' >$@
   
 engine/prim_num.i:      prim.b prims2x.fs  engine/prim_num.i:      prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c-prim-num ' noop process-file bye" >$@                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c-prim-num ' noop process-file bye" >$@

Removed from v.1.244  
changed lines
  Added in v.1.255


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