Diff for /gforth/Makefile.in between versions 1.227 and 1.249

version 1.227, 2002/09/14 08:20:18 version 1.249, 2003/01/26 20:56:36
Line 30 Line 30
   
 # ------------- gforth version  # ------------- gforth version
   
 VERSION = @VERSION@  VERSION = @PACKAGE_VERSION@
 DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'`  DOSVERSION=`echo $(VERSION)|sed 's/\.//g'|sed 's/-.*//g'`
   
 # ------------- System specific variables         # ------------- System specific variables       
Line 170  KERN_SRC = \ Line 170  KERN_SRC = \
         kernel/saccept.fs \          kernel/saccept.fs \
         kernel/doers.fs \          kernel/doers.fs \
         kernel/getdoers.fs \          kernel/getdoers.fs \
         kernel/pass.fs          kernel/pass.fs \
           kernel/groups.fs
   
 EC_SRC = \  EC_SRC = \
         asm/README \          asm/README \
Line 192  GFORTH_FI_SRC = \ Line 193  GFORTH_FI_SRC = \
         blocked.fb \          blocked.fb \
         blocks.fs \          blocks.fs \
         bufio.fs \          bufio.fs \
           code.fs \
         debug.fs \          debug.fs \
         debugs.fs \          debugs.fs \
         ekey.fs \          ekey.fs \
Line 228  GFORTH_FI_SRC = \ Line 230  GFORTH_FI_SRC = \
   
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_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 \          colorize.fs comp-i.fs \
         doskey.fs ds2texi.fs \          doskey.fs ds2texi.fs \
         envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \          envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
         glosgen.fs gray.fs httpd.fs proxy.fs \          glosgen.fs gray.fs httpd.fs proxy.fs \
Line 238  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/other.fs test/signals.fs test/checkans.fs \          test/string.fs test/float.fs test/gforth.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 332  VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen- Line 335  VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-
 SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \  SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/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 \
         acconfig.h acinclude.m4 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 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/memcmpc.c engine/signals.c $(ARCHS) \          engine/io.c engine/support.c engine/signals.c \
         engine/peephole.c engine/profile.c \          $(ARCHS) \
           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 358  SOURCES = $(CVSDIRS) compat Makefile.in Line 362  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-itc$(EXE) gforth-prof$(EXE) kernel/version.fs  GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) kernel/version.fs
   #gforth-native$(EXE) gforth-prof$(EXE)
   
 # 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 engine/prim_superend.i engine/peephole.i engine/profile.i  FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
 FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs          engine/prim_superend.i engine/profile.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_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 438  docclean: FORCE Line 446  docclean: FORCE
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) engine/gforth$(EXE) \                  -$(RM) -rf $(GEN) engine/gforth$(EXE) \
                 engine/gforth-fast$(EXE) engine/gforth-itc$(EXE) \                  engine/gforth-fast$(EXE) engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \
                 engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \                  engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) \
                 *.o engine/*.o arch/*/*.o version                  *.o engine/*.o arch/*/*.o version
   
Line 542  uninstall: FORCE Line 550  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)/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)/gforthmi $(bindir)/vmgen $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth"
   
 check test:     gforth$(EXE) gforth.fi  check:          gforths 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                  $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1
                   $(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1
                   $(MAKE) checkone ENGINE="./gforth-ditc" >/dev/null 2>&1
                   $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1
                   $(MAKE) checkone ENGINE="./gforth" >/dev/null 2>&1
                   $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
                   @echo "*** Check successful ***"
   
   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 test/gforth.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                  $(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
Line 558  bench:  gforth-fast$(EXE) gforth.fi Line 575  bench:  gforth-fast$(EXE) gforth.fi
                 time $(FORTH_FAST) 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"
   
   onebench:
                   @\time -f "siev   %U" $(FORTH_FAST) siev.fs -e "main bye"
                   @\time -f "bubble %U" $(FORTH_FAST) -e "warnings off" bubble.fs -e "main bye"
                   @\time -f "matrix %U" $(FORTH_FAST) matrix.fs -e "main bye"
                   @\time -f "fib    %U" $(FORTH_FAST) fib.fs -e "main bye"
   
   all-bench:      gforth-fast$(EXE) gforth$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth.fi
                   @echo "*** gforth-fast dynamic:"
                   @$(MAKE) onebench ENGINE_FAST="gforth-fast --dynamic"
                   @echo "*** gforth-fast not dynamic:"
                   @$(MAKE) onebench ENGINE_FAST="gforth-fast --no-dynamic"
                   @echo "*** gforth dynamic:"
                   @$(MAKE) onebench ENGINE_FAST="gforth --dynamic"
                   @echo "*** gforth not dynamic:"
                   @$(MAKE) onebench ENGINE_FAST="gforth --no-dynamic"
                   @echo "*** gforth-itc:"
                   @$(MAKE) onebench ENGINE_FAST=gforth-itc
                   @echo "*** gforth-ditc:"
                   @$(MAKE) onebench ENGINE_FAST=gforth-ditc
   
 # ------------- Make forth images  # ------------- Make forth images
   
 # How to make new images:  # How to make new images:
Line 586  kernl64l.fi-: $(KERN_DEPS) mach64l.fs Line 623  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 $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  kernl-%.fi:     arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
                 if [ -f `echo $< | sed s/fs/sh/` ]; \                  if [ -f `echo $< | sed s/fs/sh/` ]; \
                 then sh `echo $< | sed s/fs/sh/` $@; \                  then sh `echo $< | sed s/fs/sh/` $@; \
Line 633  prim.b:  prim peeprules.vmg Line 670  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
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" save-mem out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 642  engine/prim_lab.i: prim.b prims2x.fs Line 679  engine/prim_lab.i: prim.b prims2x.fs
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
   engine/prim_grp.i:      prim.b prims2x.fs
                   $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' noop dup process-file bye" >$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
 engine/prim_names.i:    prim.b prims2x.fs  engine/prim_names.i:    prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-forthname dup process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-forthname dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
Line 662  engine/profile.i: prim.b prims2x.fs Line 704  engine/profile.i: prim.b prims2x.fs
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
   engine/costs.i: prim.b prims2x.fs
                   $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@-
                   $(CP) $@- $@
                   $(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 $@-
                 $(FORTHP) 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" >>$@-
Line 674  kernel/prim.fs: prim.b prims2x.fs kernel Line 721  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 kernel/peephole.fs:     prim.b prims2x.fs  kernel/groups.fs:       engine/prim_grp.i
                 $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' noop ' output-forth-peephole process-file bye" >$@-          grep GROUP $< | cut -f2 -d, | sed -e 's/)/ ,/g' >$@
                 $(CP) $@- $@  
                 $(RM) $@-  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" >$@
   
 gforth$(EXE):           engines  gforth$(EXE):           engines
                 -$(CP) gforth$(EXE) gforth~                  -$(CP) gforth$(EXE) gforth~
Line 688  gforth-fast$(EXE): engines Line 736  gforth-fast$(EXE): engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHFAST_EXE@                  @GFORTHFAST_EXE@
   
   gforth-native$(EXE):    engines
                   $(CP) engine/$@ $@
   #@GFORTHX_EXE@
   
 gforth-itc$(EXE):       engines  gforth-itc$(EXE):       engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHITC_EXE@                  @GFORTHITC_EXE@
Line 699  gforth-ditc$(EXE): engines Line 751  gforth-ditc$(EXE): engines
 gforth-prof$(EXE):      engines  gforth-prof$(EXE):      engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
   
 gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)  gforths: gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE)
   
 engines:        FORCE $(FORTH_GEN_ENGINE) engine/Makefile  engines:        FORCE $(FORTH_GEN_ENGINE) engine/Makefile
                 cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) gforth-prof$(EXE)                  cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-ditc$(EXE) #gforth-prof$(EXE) gforth-native$(EXE)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
Line 815  doc:  info doc/gforth doc/vmgen doc/gfor Line 867  doc:  info doc/gforth doc/vmgen doc/gfor
   
 #Note: no target "$(srcdir)/configure", because that does not trigger   #Note: no target "$(srcdir)/configure", because that does not trigger 
 #unless $(srcdir)!="."  #unless $(srcdir)!="."
 configure:      configure.in aclocal.m4  configure: configure.in aclocal.m4
                 cd $(srcdir) && autoconf          cd $(srcdir) && autoconf
   
 aclocal.m4:     acinclude.m4 configure.in  aclocal.m4:     configure.in
                 aclocal                  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.
 engine/config.h.in:     stamp-h.in  engine/config.h.in: stamp-h.in
 stamp-h.in:     configure.in  acconfig.h  stamp-h.in: configure.in aclocal.m4
                 cd $(srcdir) && autoheader          cd $(srcdir) && autoheader
                 echo timestamp > $(srcdir)/stamp-h.in          echo timestamp > $(srcdir)/stamp-h.in
   
 engine/config.h:        stamp-h  engine/config.h: stamp-h
 stamp-h:        engine/config.h.in config.status  stamp-h: engine/config.h.in config.status
                 CONFIG_FILES=$@ CONFIG_HEADERS="engine/config.h" ./config.status          ./config.status
                 echo timestamp > stamp-h  
   
 Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi:    Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in  Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi:     Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in
                 CONFIG_FILES="$@" CONFIG_HEADERS="engine/config.h" ./config.status          ./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

Removed from v.1.227  
changed lines
  Added in v.1.249


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