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

version 1.244, 2003/01/10 21:43:41 version 1.266, 2003/05/13 09:36:59
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
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 59  TAR = tar cf - Line 59  TAR = tar cf -
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@  INSTALL_DATA = @INSTALL_DATA@
   INSTALL_INFO = @INSTALL_INFO@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 GCC     = @CC@  GCC     = @CC@
 CC      = $(GCC)  CC      = $(GCC)
Line 74  FORTHS = $(ENGINE) $(FORTHS_ARGS) Line 75  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 3 exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # 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 87  FORTHK = $(ENGINE) $(FORTHKFLAGS) Line 88  FORTHK = $(ENGINE) $(FORTHKFLAGS)
 STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@  STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi -e  TEXI2DVI = texi2dvi -e
 DVI2PS  = dvips -Z  DVI2PS  = dvips -t letterSize -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/  #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 MAKEINFO = makeinfo  MAKEINFO = makeinfo
 TEXI2HTML = texi2html  TEXI2HTML = texi2html
Line 235  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 236  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         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 \
         make-app.fs doc/makedoc.fs \          make-app.fs doc/makedoc.fs \
         more.fs other.fs prims2x.fs random.fs \          locate.fs more.fs other.fs prims2x.fs random.fs \
         table.fs string.fs \          sokoban.fs string.fs table.fs tags.fs \
         tt.fs sokoban.fs \          tt.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 275  ARCHS = \ Line 276  ARCHS = \
         arch/sparc/machine.h \          arch/sparc/machine.h \
         arch/power/machine.h \          arch/power/machine.h \
         arch/power/_sync_cache_range.c \          arch/power/_sync_cache_range.c \
         arch/power/elf32ppc.x \  
         arch/alpha/machine.h \          arch/alpha/machine.h \
         arch/ia64/machine.h \          arch/ia64/machine.h \
         arch/4stack/README \          arch/4stack/README \
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 doc/gpl.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 369  GEN = gforth$(EXE) gforth-ditc$(EXE) gfo Line 370  GEN = gforth$(EXE) gforth-ditc$(EXE) gfo
 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          engine/costs.i engine/super2.i
 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 379  FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ Line 380  FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@
 KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs  KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs
   
 #distributed documentation  #distributed documentation
 DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps  DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \
             doc/vmgen.info doc/vmgen.info-* doc/vmgen.ps
   
 KERNLS = kernl16b.fi- kernl16l.fi- \  KERNLS = kernl16b.fi- kernl16l.fi- \
          kernl32b.fi- kernl32l.fi- \           kernl32b.fi- kernl32l.fi- \
Line 505  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 507  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)
                 (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)                  (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
                 (cd $(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)                  (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* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(infodir); done
                 for i in $(FORTH_SRC) $(COMPAT) prim; do \                  for i in $(FORTH_SRC) $(COMPAT) prim; do \
                         $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \                          $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION)/$$i; \
                 done                  done
Line 530  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 535  install: gforth$(EXE) $(FORTH_SRC) $(ker
                 $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) gforth.fi install.TAGS                  $(RM) gforth.fi install.TAGS
                 @echo ">>>>> Please make an entry for Gforth in your info dir file; e.g.:"; \                  $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/gforth.info
                 echo "* Gforth: (gforth).       A fast interpreter for the Forth language."                  $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/vmgen.info
   
 install-strip:  install  install-strip:  install
   
Line 547  installdirs: mkinstalldirs Line 552  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 565  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 628  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 704  engine/profile.i: prim.b prims2x.fs Line 710  engine/profile.i: prim.b prims2x.fs
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
   engine/super2.i:        prim.b prims2x.fs
                   $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-super2 dup process-file bye" >$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
 engine/costs.i: prim.b prims2x.fs  engine/costs.i: prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@-                  $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
Line 711  engine/costs.i: prim.b prims2x.fs Line 722  engine/costs.i: prim.b prims2x.fs
   
 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 ' noop process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 722  kernel/prim.fs: prim.b prims2x.fs kernel Line 733  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.266


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