Diff for /gforth/Makefile.in between versions 1.374 and 1.375

version 1.374, 2008/01/02 21:04:44 version 1.375, 2008/01/04 21:48:53
Line 72  FORTHPATH = .$(PATHSEP)$(libdir)/gforth/ Line 72  FORTHPATH = .$(PATHSEP)$(libdir)/gforth/
 FORTHSIZES = @FORTHSIZES@  FORTHSIZES = @FORTHSIZES@
 FORTHS_ARGS =  -p "$(FORTHPATH)$(PATHSEP)$(srcdir)"  FORTHS_ARGS =  -p "$(FORTHPATH)$(PATHSEP)$(srcdir)"
 FORTH_ARGS = --die-on-signal $(FORTHS_ARGS)  FORTH_ARGS = --die-on-signal $(FORTHS_ARGS)
 ENGINE = ./gforth  ENGINE = ./gforth$(OPT)
 FORTH   = $(ENGINE) $(FORTH_ARGS)  FORTH   = $(ENGINE) $(FORTH_ARGS)
 FORTHS  = $(ENGINE) $(FORTHS_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
Line 103  TEXI2HTML = texi2html Line 103  TEXI2HTML = texi2html
   
 XCFLAGS = @CFLAGS@  XCFLAGS = @CFLAGS@
 XDEFINES = @DEFS@  XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions  SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves  ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@  DEBUGFLAG = @DEBUGFLAG@
 CFLAGS  = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"'  CFLAGS  = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"'
Line 416  SOURCES = $(CVSDIRS) compat Makefile.in Line 416  SOURCES = $(CVSDIRS) compat Makefile.in
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES)  ENGINES = gforth$(OPT)$(EC)$(EXE) gforth-ditc$(OPT)$(EC)$(EXE) gforth-itc$(OPT)$(EC)$(EXE) $(PROFEXES)
   
 ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE)   ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(EXE) 
   
 GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc  GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc
   
Line 439  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor Line 439  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec  FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec
   
 #kernel dependencies  #kernel dependencies
 KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs gforth$(EXE)  KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs gforth$(OPT)$(EXE)
   
 #distributed documentation  #distributed documentation
 DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \  DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \
Line 515  docclean: FORCE Line 515  docclean: FORCE
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \                  -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
                 engine/gforth$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \                  engine/gforth$(OPT)$(EC)$(EXE) engine/gforth-fast$(OPT)$(EC)$(EXE) \
                 engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \                  engine/gforth-native$(OPT)$(EC)$(EXE) engine/gforth-itc$(OPT)$(EC)$(EXE) \
                 engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) \                  engine/gforth-ditc$(OPT)$(EC)$(EXE) engine/gforth-prof$(OPT)$(EC)$(EXE) \
                 engine/prim-s.i                  engine/prim-s.i
   
 distclean:      clean  distclean:      clean
Line 609  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 609  install: gforth$(EC)$(EXE) $(FORTH_SRC)
                         echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \                          echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \
                 fi                  fi
                 -$(RM) gforth.fi                  -$(RM) gforth.fi
                 GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)                  GFORTHD="./gforth-ditc$(OPT) -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc$(OPT) --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
                 $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) gforth.fi install.TAGS                  $(RM) gforth.fi install.TAGS
Line 638  uninstall: FORCE Line 638  uninstall: FORCE
                 @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth"                  @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth"
   
 check:          gforths gforth.fi  check:          gforths gforth.fi
                 $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth$(OPT) --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-itc$(OPT)" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-ditc$(OPT)" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast$(OPT) --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth$(OPT)" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast$(OPT)" >/dev/null 2>&1
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
   
 checkone test:  gforth$(EC)$(EXE) gforth.fi engine/prim-s.i  checkone test:  gforth$(OPT)$(EC)$(EXE) gforth.fi engine/prim-s.i
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | 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/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | 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
Line 656  checkone test: gforth$(EC)$(EXE) gforth. Line 656  checkone test: gforth$(EC)$(EXE) gforth.
                   "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"| \
                   tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i                    tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i
   
 check-nofast: gforth$(EC)$(EXE) gforth.fi  check-nofast: gforth$(OPT)$(EC)$(EXE) gforth.fi
                 $(FORTHS) test/gforth-nofast.fs -e bye                  $(FORTHS) test/gforth-nofast.fs -e bye
   
 test/primtest.fi: test/primtest.fs mach32l.fs cross.fs  test/primtest.fi: test/primtest.fs mach32l.fs cross.fs
Line 665  test/primtest.fi: test/primtest.fs mach3 Line 665  test/primtest.fi: test/primtest.fs mach3
 primtest:       gforth gforth-native test/primtest.fi FORCE  primtest:       gforth gforth-native test/primtest.fi FORCE
                 (echo rs|ENVVAR=bla ./gforth -i test/primtest.fi) && (echo rs|ENVVAR=bla ./gforth-native -i test/primtest.fi); echo $$?                  (echo rs|ENVVAR=bla ./gforth -i test/primtest.fi) && (echo rs|ENVVAR=bla ./gforth-native -i test/primtest.fi); echo $$?
   
 bench:          gforth-fast$(EC)$(EXE) gforth.fi  bench:          gforth-fast$(OPT)$(EC)$(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"
Line 675  bench:  gforth-fast$(EC)$(EXE) gforth.fi Line 675  bench:  gforth-fast$(EC)$(EXE) gforth.fi
 onebench one-bench:  onebench one-bench:
         $(FORTH_FAST) onebench.fs          $(FORTH_FAST) onebench.fs
   
 all-bench allbench:     gforth-fast$(EC)$(EXE) gforth$(EC)$(EXE) gforth-itc$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth.fi  all-bench allbench:     gforth-fast$(OPT)$(EC)$(EXE) gforth$(OPT)$(EC)$(EXE) gforth-itc$(OPT)$(EC)$(EXE) gforth-ditc$(OPT)$(EC)$(EXE) gforth.fi
         ./gforth-fast --dynamic onebench.fs          ./gforth-fast --dynamic onebench.fs
         ./gforth-fast --no-dynamic onebench.fs          ./gforth-fast --no-dynamic onebench.fs
         ./gforth --dynamic onebench.fs          ./gforth --dynamic onebench.fs
Line 755  kernl64l$(EC).fi: $(KERNLS) Line 755  kernl64l$(EC).fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs  gforth.fi:      $(kernel_fi) gforthmi gforth$(OPT)$(EC)$(EXE) gforth-ditc$(OPT)$(EC)$(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)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)                  GFORTHD="./gforth-ditc$(OPT) -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc$(OPT) --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
Line 789  kernel/prim.fs: prim.b prims2x.fs kernel Line 789  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 gforth$(EC)$(EXE):              engines  gforth$(OPT)$(EC)$(EXE):                engines
                 -$(CP) gforth$(EC)$(EXE) gforth~                  -$(CP) gforth$(OPT)$(EC)$(EXE) gforth~
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 -$(MASSAGE_EXE) $@                  -$(MASSAGE_EXE) $@
                 @GFORTH_EXE@                  @GFORTH_EXE@
   
 gforth-fast$(EC)$(EXE): engines-fast  gforth-fast$(OPT)$(EC)$(EXE):   engines-fast
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 -$(MASSAGE_EXE) $@                  -$(MASSAGE_EXE) $@
                 @GFORTHFAST_EXE@                  @GFORTHFAST_EXE@
   
 gforth-native$(EC)$(EXE):       engines-fast  gforth-native$(OPT)$(EC)$(EXE): engines-fast
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 -$(MASSAGE_EXE) $@                  -$(MASSAGE_EXE) $@
 #@GFORTHX_EXE@  #@GFORTHX_EXE@
   
 gforth-itc$(EC)$(EXE):  engines  gforth-itc$(OPT)$(EC)$(EXE):    engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHITC_EXE@                  @GFORTHITC_EXE@
   
 gforth-ditc$(EC)$(EXE): engines  gforth-ditc$(OPT)$(EC)$(EXE):   engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 gforth-prof$(EC)$(EXE): engines  gforth-prof$(OPT)$(EC)$(EXE):   engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
   
 gforths: $(ENGINES) $(ENGINES_FAST)  gforths: $(ENGINES) $(ENGINES_FAST)
Line 844  tags:  gforth.tags Line 844  tags:  gforth.tags
 install.TAGS:   TAGS  install.TAGS:   TAGS
                 sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >install.TAGS                  sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >install.TAGS
   
 gforth.TAGS:    @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS  gforth.TAGS:    @kernel_fi@ gforth$(OPT)$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
                 $(FORTHK) etags.fs except.fs startup.fs -e bye                  $(FORTHK) etags.fs except.fs startup.fs -e bye
                 cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS                  cat TAGS prim.TAGS kernel.TAGS >gforth.TAGS
                 rm TAGS                  rm TAGS
   
 gforth.tags:    @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags  gforth.tags:    @kernel_fi@ gforth$(OPT)$(EC)$(EXE) $(GFORTH_FI_SRC) prim.tags kernel.tags
                 $(FORTHK) tags.fs except.fs startup.fs -e bye                  $(FORTHK) tags.fs except.fs startup.fs -e bye
                 cat tags prim.tags kernel.tags >gforth.tags                  cat tags prim.tags kernel.tags >gforth.tags
                 rm tags                  rm tags

Removed from v.1.374  
changed lines
  Added in v.1.375


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