Diff for /gforth/Makefile.in between versions 1.474 and 1.483

version 1.474, 2012/03/22 01:45:42 version 1.483, 2012/07/20 23:04:29
Line 46  EXE=@EXEEXT@ Line 46  EXE=@EXEEXT@
 PATHSEP = @PATHSEP@  PATHSEP = @PATHSEP@
   
 EC = @EC@  EC = @EC@
   ARCH= @ARCH@
   EXT = $(EC)$(ARCH)$(EXE)
   LA = $(EC)$(ARCH).la
   
 # ------------  Install Directories  # ------------  Install Directories
   
Line 61  datadir = $(package)@datadir@ Line 64  datadir = $(package)@datadir@
 #read-only architecture-dependent non-ascii files  #read-only architecture-dependent non-ascii files
 libdir = $(package)@libdir@  libdir = $(package)@libdir@
 libexecdir = $(package)@libexecdir@  libexecdir = $(package)@libexecdir@
 libccdir = $(subst $(DESTDIR),,$(libexecdir)/gforth/$(VERSION)/libcc-named/)  libccdir = $(subst $(DESTDIR),,$(libexecdir)/gforth$(ARCH)/$(VERSION)/libcc-named/)
 includedir = $(package)@includedir@  includedir = $(package)@includedir@
 infodir = $(package)@infodir@  infodir = $(package)@infodir@
 htmldir = $(package)@htmldir@  htmldir = $(package)@htmldir@
Line 86  MASSAGE_EXE = @MASSAGE_EXE@ Line 89  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@ -f
 M4      = @M4@  M4      = @M4@
 GCC     = @CC@  GCC     = @CC@
 EMACS   = @EMACS@  EMACS   = @EMACS@
 LIBTOOL = @GNU_LIBTOOL@  LIBTOOL = @GNU_LIBTOOL@
 PREFORTH        = ./preforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"  PREFORTH        = ./preforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 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$(ARCH)/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 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)
Line 108  BUILDFORTH = $(ENGINE) --die-on-signal - Line 111  BUILDFORTH = $(ENGINE) --die-on-signal -
 FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)'  FORTHB = $(BUILDFORTH) 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 = ./gforth-fast  ENGINE_FAST = ./gforth-fast$(EXT)
 FORTH_FAST      = $(ENGINE_FAST) $(FORTH_ARGS)  FORTH_FAST      = $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)  FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
 FORTHK  = ./gforthker -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"  FORTHK  = ./gforthker -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
Line 235  GFORTH_FI_SRC2=\ Line 238  GFORTH_FI_SRC2=\
         hash.fs \          hash.fs \
         history.fs \          history.fs \
         intcomp.fs \          intcomp.fs \
           i18n.fs \
         mkdir.fs \          mkdir.fs \
         libcc.fs \          libcc.fs \
         locals.fs \          locals.fs \
Line 242  GFORTH_FI_SRC2=\ Line 246  GFORTH_FI_SRC2=\
         mkdir.fs \          mkdir.fs \
         prelude.fs \          prelude.fs \
         quotes.fs \          quotes.fs \
           quotedstring.fs \
           parsedto.fs \
         search.fs \          search.fs \
         see.fs \          see.fs \
         see-ext.fs \          see-ext.fs \
Line 252  GFORTH_FI_SRC2=\ Line 258  GFORTH_FI_SRC2=\
         struct.fs \          struct.fs \
         struct0x.fs \          struct0x.fs \
         stuff.fs \          stuff.fs \
           substitute.fs \
         tasker.fs \          tasker.fs \
         termsize.fs \          termsize.fs \
         utf-8.fs \          utf-8.fs \
Line 307  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST Line 314  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST
         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 \
         add.fs lib.fs oldlib.fs sieve.fs \          add.fs lib.fs oldlib.fs sieve.fs \
         endtry-iferror.fs recover-endtry.fs          endtry-iferror.fs recover-endtry.fs smartdots.fs
   
 COMPAT = compat/README \  COMPAT = compat/README \
         compat/anslocal.fs \          compat/anslocal.fs \
Line 456  SOURCES = $(ENGINE_SOURCES) compat Makef Line 463  SOURCES = $(ENGINE_SOURCES) compat Makef
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 ENGINES = gforth$(EC)$(EXE) @NO_EC@ gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES)  ENGINES = gforth$(EXT) @NO_EC@ gforth-ditc$(EXT) gforth-itc$(EXT) $(PROFEXES)
   
 ENGINES_FAST = @NO_EC@ gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE)   ENGINES_FAST = @NO_EC@ gforth-fast$(OPT)$(EXT) #gforth-native$(OPT)$(EXT) 
   
 GEN = $(ENGINES) $(ENGINES_FAST) @gforth_elc@  GEN = $(ENGINES) $(ENGINES_FAST) @gforth_elc@
   
Line 523  version: Makefile.in configure.in Line 530  version: Makefile.in configure.in
 kernel/version.fs:      version  kernel/version.fs:      version
         echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   $(ENGINES) $(FORTH_GEN) $(GEN) @build_libcc_named@  more:   $(ENGINES) $(FORTH_GEN) $(GEN) @libengines@ @build_libcc_named@
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 555  docclean: FORCE Line 562  docclean: FORCE
                 doc/gforth.toc doc/gforth.tp doc/gforth.vr html                  doc/gforth.toc doc/gforth.tp doc/gforth.vr html
   
 clean:          mostlyclean  clean:          mostlyclean
         -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \          -$(RM) -rf $(GEN) *.o engine/*.o engine/*.lo engine/*.la \
         gforth-itc-noll$(EC)$(EXE)  engine/gforth-itc-noll$(EC)$(EXE)  \          engine/.libs engine/libgforth* libgforth* arch/*/*.o version \
         gforth-ditc-noll$(EC)$(EXE) engine/gforth-ditc-noll$(EC)$(EXE) \          gforth-itc-noll$(EXT)  engine/gforth-itc-noll$(EXT)  \
         gforth-prof-noll$(EC)$(EXE) engine/gforth-prof-noll$(EC)$(EXE) \          gforth-ditc-noll$(EXT) engine/gforth-ditc-noll$(EXT) \
           gforth-prof-noll$(EXT) engine/gforth-prof-noll$(EXT) \
         engine/prim-s.i          engine/prim-s.i
         for i in gforth gforth-fast gforth-native; do for j in $(OPTS); do rm -f engine/$$i$${j}$(EC)$(EXE) $$i$${j}$(EC)$(EXE); done; done          for i in gforth gforth-fast gforth-native; do for j in $(OPTS); do rm -f engine/$$i$${j}$(EXT) $$i$${j}$(EXT); done; done
   
 distclean:      clean  distclean:      clean
                 -$(RM) -rf config.cache config.log config.status \                  -$(RM) -rf config.cache config.log config.status \
Line 624  hpux-workaround: Line 632  hpux-workaround:
 #hard to generate).  #hard to generate).
 #we rebuild gforth.fi, because it contains some path names.  #we rebuild gforth.fi, because it contains some path names.
 #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.  #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.
 install:        gforth$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs @NO_CROSS@ gforth.fi  install:        gforth$(EXT) $(FORTH_SRC) $(kernel_fi) gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs @libinstall@ @NO_CROSS@ gforth.fi
                 $(NORMAL_INSTALL)                  $(NORMAL_INSTALL)
                 touch $(DESTDIR)$(siteforthdir)/siteinit.fs                  touch $(DESTDIR)$(siteforthdir)/siteinit.fs
                 -$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen                  -$(RM) $(DESTDIR)$(bindir)/gforth$(EXT) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen
                 -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)                  -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EXT) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXT)
                 -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE)                  -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EXT) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXT)
                 $(INSTALL_PROGRAM) gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE)                  -$(RM) $(DESTDIR)$(bindir)/gforth-ditc$(EXT) $(DESTDIR)$(bindir)/gforth-ditc-$(VERSION)$(EXT)
                 -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE)                  $(INSTALL_PROGRAM) gforth$(EXT) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT)
                 (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EC)$(EXE) gforth$(EC)$(EXE))                  -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT)
                 $(INSTALL_PROGRAM) gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)                  (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EXT) gforth$(EXT))
                 -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)                  $(INSTALL_PROGRAM) gforth-fast$(EXT) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXT)
                 (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EC)$(EXE) gforth-fast$(EC)$(EXE))                  -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXT)
                 $(INSTALL_PROGRAM) gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE)                  (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXT) gforth-fast$(EXT))
                 (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EC)$(EXE) gforth-itc$(EC)$(EXE))                  $(INSTALL_PROGRAM) gforth-itc$(EXT) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXT)
                 $(INSTALL_PROGRAM) gforth-ditc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-ditc-$(VERSION)$(EC)$(EXE)                  (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXT) gforth-itc$(EXT))
                 (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-ditc-$(VERSION)$(EC)$(EXE) gforth-ditc$(EC)$(EXE))                  $(INSTALL_PROGRAM) gforth-ditc$(EXT) $(DESTDIR)$(bindir)/gforth-ditc-$(VERSION)$(EXT)
                   (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-ditc-$(VERSION)$(EXT) gforth-ditc$(EXT))
                 $(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION)                  $(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION)
                 $(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION)                  $(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION)
                 (cd $(DESTDIR)$(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)                  (cd $(DESTDIR)$(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
Line 649  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 658  install: gforth$(EC)$(EXE) $(FORTH_SRC)
                 for i in $(FORTH_SRC) $(COMPAT) envos.fs prim; do \                  for i in $(FORTH_SRC) $(COMPAT) envos.fs prim; do \
                         $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \                          $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \
                 done                  done
                 $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION)
                 @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \                  @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
                         for i in gforth.el @gforth_elc@; do \                          for i in gforth.el @gforth_elc@; do \
                                 $(INSTALL_DATA) $$i $(DESTDIR)$(emacssitelispdir); \                                  $(INSTALL_DATA) $$i $(DESTDIR)$(emacssitelispdir); \
Line 658  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 667  install: gforth$(EC)$(EXE) $(FORTH_SRC)
                         echo '>>>>>Please install gforth.{el,elc} in your .../emacs/site-lisp directory'; \                          echo '>>>>>Please install gforth.{el,elc} in your .../emacs/site-lisp directory'; \
                 fi                  fi
                 -$(RM) gforth.fi                  -$(RM) gforth.fi
                 @NO_CROSS@GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$(bindir) libccdir=$(libccdir) GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)                  @NO_CROSS@GFORTHD="./gforth-ditc$(EXT) -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc$(EXT) -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$(bindir) libccdir=$(libccdir) GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
                 @NO_CROSS@$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)                  @NO_CROSS@$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) install.TAGS @NO_CROSS@gforth.fi                  $(RM) install.TAGS @NO_CROSS@gforth.fi
                 $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)                  $(INSTALL_DATA) include/gforth$(ARCH)/$(VERSION)/* $(DESTDIR)$(includedir)/gforth$(ARCH)/$(VERSION)
                 if test -n "$(LIBTOOL)"; then for i in $(LIBCC_BUILD_SRC); do \                  if test -n "$(LIBTOOL)"; then for i in $(LIBCC_BUILD_SRC); do \
                    $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; \                     $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth$(ARCH)/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; \
                 done; fi                  done; fi
                 $(POST_INSTALL)                  $(POST_INSTALL)
                 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info                  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info
Line 672  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 681  install: gforth$(EC)$(EXE) $(FORTH_SRC)
   
 install-strip:  install  install-strip:  install
   
   libinstall:     $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%)
                   for i in $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%); do \
                      $(LIBTOOL) --silent --mode=install $(INSTALL) engine/$$i.la $(libdir)/$$i.la; \
                   done
   
 installdirs:    mkinstalldirs  installdirs:    mkinstalldirs
                 $(NORMAL_INSTALL)                  $(NORMAL_INSTALL)
                 for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \                  for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth$(ARCH)/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth$(ARCH)/$(VERSION) $(libccdir); do \
                         $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \                          $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
                 done                  done
                 #                  #
Line 686  installdirs: mkinstalldirs Line 700  installdirs: mkinstalldirs
 #to uninstall version foo, type `make uninstall VERSION=foo'  #to uninstall version foo, type `make uninstall VERSION=foo'
 uninstall:      FORCE  uninstall:      FORCE
                 $(NORMAL_UNINSTALL)                  $(NORMAL_UNINSTALL)
                 -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)$(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION)                  -$(RM) -rf $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)$(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION)
                 @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$(EXT) $(DESTDIR)$(bindir)/gforth-fast$(EXT) $(DESTDIR)$(bindir)/gforth-itc$(EXT) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth"
   
 build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE  build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE
                 $(RMTREE) lib/gforth/$(VERSION)/libcc-named/                  $(RMTREE) lib/gforth$(ARCH)/$(VERSION)/libcc-named/
                 for i in $(LIBCC_BUILD_SRC); do ./libforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path :noname 2drop s\" $(DESTDIR)$(libccdir)\" ; is replace-rpath" $(srcdir)/$$i -e bye; done                  for i in $(LIBCC_BUILD_SRC); do ./libforth -e "s\" `pwd`/lib/gforth$(ARCH)/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path :noname 2drop s\" $(DESTDIR)$(libccdir)\" ; is replace-rpath" $(srcdir)/$$i -e bye; done
   
 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$(EXT) --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-itc$(EXT)" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-ditc$(EXT)" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast$(EXT) --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth$(EXT)" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast$(EXT)" >/dev/null 2>&1
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
                 ./gforth-fast --diag -e bye                  ./gforth-fast$(EXT) --diag -e bye
   
 checkone test: gforth.fi engine/prim-s.i  checkone test: 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>/dev/null | 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>/dev/null | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
Line 722  test/primtest.fi: test/primtest.fs mach3 Line 736  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$(EXT) 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 807  kernl64l$(EC).fi: $(KERNLS) Line 821  kernl64l$(EC).fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs  gforth.fi:      $(kernel_fi) gforthmi gforth-ditc$(EXT) $(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` libccdir=`pwd`/lib/gforth/$(VERSION)/libcc-named/ ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)                  @NO_CROSS@GFORTHD="./gforth-ditc$(EXT) -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc$(EXT) --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` libccdir=`pwd`/lib/gforth$(ARCH)/$(VERSION)/libcc-named/ ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
Line 849  MAKELINE-noll-reg = OPT=-noll-reg OPTDEF Line 863  MAKELINE-noll-reg = OPT=-noll-reg OPTDEF
 MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=  MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=
 MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o  MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o
   
 gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@  gforth$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@
         if test -z "$(OPT)"; then \          if test -z "$(OPT)"; then \
                 for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \                  for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EXT) $@ && break; done; \
         else \          else \
                 ( cd engine && $(MAKE) $@ ) && \                  ( cd engine && $(MAKE) $@ ) && \
                 $(CP) engine/$@ $@ && \                  $(CP) engine/$@ $@ && \
Line 861  gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE Line 875  gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE
         fi          fi
   
 optgforth:  optgforth:
         $(MAKE) gforth$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT))          $(MAKE) gforth$(OPT)$(EXT) $(MAKELINE$(OPT))
   
 gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h  gforth-fast$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h
         if test -z "$(OPT)"; then \          if test -z "$(OPT)"; then \
                 for i in $(OPTS); do $(MAKE) optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EC)$(EXE) $@ && break; done; \                  for i in $(OPTS); do $(MAKE) optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EXT) $@ && break; done; \
         else \          else \
                 ( cd engine && $(MAKE) $@ ) && \                  (cd engine && $(MAKE) $@ ) && \
                 $(CP) engine/$@ $@ && \                  $(CP) engine/$@ $@ && \
                 $(MASSAGE_EXE) $@; \                  $(MASSAGE_EXE) $@; \
                 @GFORTHFAST_EXE@; \                  @GFORTHFAST_EXE@; \
Line 875  gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_S Line 889  gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_S
         fi          fi
   
 optgforth-fast:  optgforth-fast:
         $(MAKE) gforth-fast$(OPT)$(EC)$(EXE) $(MAKELINE$(OPT))          $(MAKE) gforth-fast$(OPT)$(EXT) $(MAKELINE$(OPT))
   
 gforth-native$(OPT)$(EC)$(EXE): engines-fast  gforth-native$(OPT)$(EXT):      engines-fast
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 -$(MASSAGE_EXE) $@                  -$(MASSAGE_EXE) $@
 #@GFORTHX_EXE@  #@GFORTHX_EXE@
   
 gforth-itc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h  gforth-itc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 cd engine && $(MAKE) gforth-itc-noll$(EC)$(EXE) $(MAKELINE-noll)                  cd engine && $(MAKE) gforth-itc-noll$(EXT) $(MAKELINE-noll)
                 $(CP) engine/gforth-itc-noll$(EC)$(EXE) $@                  $(CP) engine/gforth-itc-noll$(EXT) $@
                 @GFORTHITC_EXE@                  @GFORTHITC_EXE@
   
 gforth-ditc$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h  gforth-ditc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 cd engine && $(MAKE) gforth-ditc-noll$(EC)$(EXE) $(MAKELINE-noll)                  cd engine && $(MAKE) gforth-ditc-noll$(EXT) $(MAKELINE-noll)
                 $(CP) engine/gforth-ditc-noll$(EC)$(EXE) $@                  $(CP) engine/gforth-ditc-noll$(EXT) $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 gforth-prof$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h  gforth-prof$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                 cd engine && $(MAKE) gforth-prof-noll$(EC)$(EXE) $(MAKELINE-noll)                  cd engine && $(MAKE) gforth-prof-noll$(EXT) $(MAKELINE-noll)
                 $(CP) engine/gforth-prof-noll$(EC)$(EXE) $@                  $(CP) engine/gforth-prof-noll$(EXT) $@
   
 gforths: $(ENGINES) $(ENGINES_FAST)  gforths: $(ENGINES) $(ENGINES_FAST)
   
   #For now, we have no way to check if the engines build correctly
   libgforth$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@
           if test -z "$(OPT)"; then \
                   for i in $(OPTS); do $(MAKE) optlibgforth OPT=$$i && $(MAKE) optlibgforth2 OPT=$$i && $(LN_S) engine/$@ $@ && break; done; \
           else \
                   (cd engine && $(MAKE) $@ ); \
                   @NO_CROSS@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
           fi
   
   optlibgforth:
           $(MAKE) libgforth$(OPT)$(EXT) $(MAKELINE$(OPT))
   
   optlibgforth2:
           (cd engine && $(MAKE) libgforth$(EXT) $(MAKELINE$(OPT)))
   
   libgforth-fast$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h
           if test -z "$(OPT)"; then \
                   for i in $(OPTS); do $(MAKE) optlibgforth-fast OPT=$$i && $(MAKE) optlibgforth-fast2 OPT=$$i && $(LN_S) engine/$@ $@ && break; done; \
           else \
                   (cd engine && $(MAKE) $@ ); \
                   @NO_CROSS@ $(MAKE) checkone ENGINE=./engine/$@; \
           fi
   
   optlibgforth-fast:
           $(MAKE) libgforth-fast$(OPT)$(EXT) $(MAKELINE$(OPT))
   
   optlibgforth-fast2:
           (cd engine && $(MAKE) libgforth-fast$(EXT) $(MAKELINE$(OPT)))
   
   libgforth-itc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                   cd engine && $(MAKE) libgforth-itc$(EXT) $(MAKELINE-noll)
   
   libgforth-ditc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                   cd engine && $(MAKE) libgforth-ditc$(EXT) $(MAKELINE-noll)
   
   libgforth-prof$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                   cd engine && $(MAKE) libgforth-prof$(EXT) $(MAKELINE-noll)
   
   libgforths: $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
 .SUFFIXES:      .c .pri  .SUFFIXES:      .c .pri
Line 920  tags:  gforth.tags Line 974  tags:  gforth.tags
 install.TAGS:   TAGS install-tags.fs  install.TAGS:   TAGS install-tags.fs
                 sed 's;^\$(srcdir)/;;' TAGS|$(PREFORTH) -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS                  sed 's;^\$(srcdir)/;;' TAGS|$(PREFORTH) -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS
   
 gforth.TAGS:    @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS  gforth.TAGS:    @kernel_fi@ gforth$(EXT) $(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$(EXT) $(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.474  
changed lines
  Added in v.1.483


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