Diff for /gforth/Makefile.in between versions 1.351 and 1.370

version 1.351, 2007/06/04 18:13:26 version 1.370, 2007/10/22 20:11:43
Line 59  CP = cp -p Line 59  CP = cp -p
 MV      = mv  MV      = mv
 TAR     = tar cf -  TAR     = tar cf -
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 MASSAGE_EXE = @MASSAGE_EXE@  MASSAGE_EXE = @MASSAGE_EXE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@  INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@  INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@  INSTALL_INFO = @INSTALL_INFO@
 LN_S    = @LN_S@  LN_S    = @LN_S@
   M4      = @M4@
 GCC     = @CC@  GCC     = @CC@
 CC      = $(GCC)  CC      = $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)  FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
Line 122  exec_prefix = @exec_prefix@ Line 123  exec_prefix = @exec_prefix@
 srcdir = @srcdir@  srcdir = @srcdir@
 bindir = @bindir@  bindir = @bindir@
 #read-only architecture-independent files  #read-only architecture-independent files
   datarootdir = @datarootdir@
 datadir = @datadir@  datadir = @datadir@
 #read-only architecture-dependent non-ascii files  #read-only architecture-dependent non-ascii files
 libdir = @libdir@  libdir = @libdir@
Line 236  GFORTH_FI_SRC = \ Line 238  GFORTH_FI_SRC = \
         source.fs \          source.fs \
         startup.fs \          startup.fs \
         struct.fs \          struct.fs \
           struct0x.fs \
         stuff.fs \          stuff.fs \
         tasker.fs \          tasker.fs \
         termsize.fs \          termsize.fs \
Line 261  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 264  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         regexp.fs sokoban.fs string.fs table.fs tags.fs \          regexp.fs sokoban.fs string.fs table.fs tags.fs \
         tt.fs \          tt.fs \
         unbuffer.fs wordsets.fs xwords.fs \          unbuffer.fs wordsets.fs xwords.fs \
         test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \          test/tester.fs test/ttester.fs \
         test/string.fs test/float.fs test/gforth.fs \          test/coretest.fs test/postpone.fs test/dbltest.fs \
           test/string.fs test/float.fs test/search.fs test/gforth.fs \
         test/other.fs test/signals.fs test/checkans.fs \          test/other.fs test/signals.fs test/checkans.fs \
         test/primtest.fs test/coreext.fs test/deferred.fs \          test/primtest.fs test/coreext.fs test/deferred.fs \
         test/coremore.fs test/gforth-nofast.fs test/libcc.fs \          test/coremore.fs test/gforth-nofast.fs test/libcc.fs \
Line 383  SOURCES = $(CVSDIRS) compat Makefile.in Line 387  SOURCES = $(CVSDIRS) compat Makefile.in
         engine/config.h.in stamp-h.in envos.fs.in \          engine/config.h.in stamp-h.in envos.fs.in \
         iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \          iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
         BUILD-FROM-SCRATCH model \          BUILD-FROM-SCRATCH model \
         COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \          COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
         doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \          doc/gforth.ds doc/gforth.1 doc/version.texi.in \
         doc/vmgen.texi doc/fdl.texi doc/gpl.texi \          doc/vmgen.texi doc/fdl.texi doc/gpl.texi \
         gforth.el \          gforth.el \
         prim cache0.vmg cache1.vmg peeprules.vmg \          prim cache0.vmg cache1.vmg peeprules.vmg \
Line 415  ENGINES = gforth$(EC)$(EXE) gforth-ditc$ Line 419  ENGINES = gforth$(EC)$(EXE) gforth-ditc$
   
 ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE)   ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE) 
   
 GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs  GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc
   
 # 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 \
Line 434  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor Line 438  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$(EC)$(EXE)  KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs gforth$(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 508  clean:  mostlyclean Line 512  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$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \
                 engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \                  engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \
                 engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE)                  engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) \
                   engine/prim-s.i
   
 distclean:      clean  distclean:      clean
                 -$(RM) -rf config.cache config.log config.status \                  -$(RM) -rf config.cache config.log config.status \
Line 594  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 599  install: gforth$(EC)$(EXE) $(FORTH_SRC)
                 done                  done
                 $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)                  $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
                 @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \                  @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
                         $(INSTALL_DATA) $(srcdir)/gforth.el $(DESTDIR)$(emacssitelispdir); \                          $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \
                 else \                  else \
                         echo ">>>>>Please install $(srcdir)/gforth.el 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) ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)                  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)
                 $(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 636  check:  gforths gforth.fi Line 641  check:  gforths gforth.fi
                 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
   
 checkone test:  gforth$(EC)$(EXE) gforth.fi  checkone test:  gforth$(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 -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
                 $(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out                  $(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
                 $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | 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"| \
                   tr -d '\015' | diff -c - $(srcdir)/engine/prim.i                    tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i
   
 check-nofast: gforth$(EC)$(EXE) gforth.fi  check-nofast: gforth$(EC)$(EXE) gforth.fi
                 $(FORTHS) test/gforth-nofast.fs -e bye                  $(FORTHS) test/gforth-nofast.fs -e bye
Line 741  kernl64l$(EC).fi: $(KERNLS) Line 746  kernl64l$(EC).fi: $(KERNLS)
 #               -$(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$(EC)$(EXE) gforth-ditc$(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 ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)                  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)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
 prim.b:         prim cache0.vmg  prim.b:         prim cache0.vmg
                 m4 -s $(srcdir)/prim >$@                  $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@
                 sleep 1 #should make hpux-workaround unnecessary                  sleep 1 #should make hpux-workaround unnecessary
   
 prim-fast.b:    prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg  prim-fast.b:    prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in
                 m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -s $(srcdir)/prim >$@                  $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@
                 sleep 1 #should make hpux-workaround unnecessary                  sleep 1 #should make hpux-workaround unnecessary
   
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs  $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs
Line 759  $(FORTH_GEN_ENGINE_FAST): prim-fast.b pr Line 764  $(FORTH_GEN_ENGINE_FAST): prim-fast.b pr
 $(FORTH_GEN_ENGINE): prim.b prims2x.fs  $(FORTH_GEN_ENGINE): prim.b prims2x.fs
                 GFORTH="$(FORTHP)" $(srcdir)/gfgen                  GFORTH="$(FORTHP)" $(srcdir)/gfgen
   
   engine/prim-s.i: engine/prim.i
           grep -v '^#line ' $(srcdir)/engine/prim.i >$@
   
 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 ' noop process-file bye" >>$@-                  $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@-
Line 823  TAGS:  gforth.TAGS Line 831  TAGS:  gforth.TAGS
 tags:           gforth.tags  tags:           gforth.tags
                 $(CP) gforth.tags $@                  $(CP) gforth.tags $@
   
 install.TAGS:   gforth.TAGS  install.TAGS:   TAGS
                 sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >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$(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
Line 837  gforth.tags: @kernel_fi@ gforth$(EC)$(EX Line 845  gforth.tags: @kernel_fi@ gforth$(EC)$(EX
                 rm tags                  rm tags
   
 prim.TAGS:      prim.b prims2x.fs  prim.TAGS:      prim.b prims2x.fs
                 #echo '2c\' >prim.TAGS.sed                  $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye"|sed 's#^./prim#prim#' >$@-
                 #echo $(srcdir)/prim >>prim.TAGS.sed  
                 #$(FORTHP) 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" >$@-  
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 858  kernel.TAGS: Line 863  kernel.TAGS:
 kernel.tags:  kernel.tags:
                 rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@                  rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
   
   #elc files
   gforth.elc:     gforth.el
                   emacs -batch -f batch-byte-compile $<
   
   #Documentation
   
 doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs  doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs
                 $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye                  $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs regexp.fs fft.fs -e bye
   
 doc/crossdoc.fd:        $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  doc/crossdoc.fd:        $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye                  $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye
Line 873  doc/gforth.texi: doc/gforth.ds prim.b ds Line 884  doc/gforth.texi: doc/gforth.ds prim.b ds
 checkdoc:       doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi  checkdoc:       doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi
                 $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye                  $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
                 -grep unknown doc/gforth.texi                  -grep unknown doc/gforth.texi
                   -grep doc- doc/gforth.texi
   
 dvi:            doc/gforth.dvi doc/vmgen.dvi  dvi:            doc/gforth.dvi doc/vmgen.dvi
   

Removed from v.1.351  
changed lines
  Added in v.1.370


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