Diff for /gforth/Makefile.in between versions 1.385 and 1.425

version 1.385, 2008/01/23 13:52:02 version 1.425, 2008/10/08 17:25:56
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 11 Line 11
   
 #This program is distributed in the hope that it will be useful,  #This program is distributed in the hope that it will be useful,
 #but WITHOUT ANY WARRANTY; without even the implied warranty of  #but WITHOUT ANY WARRANTY; without even the implied warranty of
 #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.#See the  #MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #GNU General Public License for more details.  #GNU General Public License for more details.
   
 #You should have received a copy of the GNU General Public License  #You should have received a copy of the GNU General Public License
Line 66  INSTALL_INFO = @INSTALL_INFO@ Line 66  INSTALL_INFO = @INSTALL_INFO@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 M4      = @M4@  M4      = @M4@
 GCC     = @CC@  GCC     = @CC@
 BOOTFORTH       = @GFORTH@  EMACS   = emacs
   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/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@  FORTHSIZES = @FORTHSIZES@
Line 107  SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTD Line 108  SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTD
 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)"'
   CPPFLAGS = @CPPFLAGS@
   
 #John Wavrik should use -Xlinker -N to get a writable text (executable)  #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@  XLDFLAGS = @LDFLAGS@
Line 128  datarootdir = @datarootdir@ Line 130  datarootdir = @datarootdir@
 datadir = @datadir@  datadir = @datadir@
 #read-only architecture-dependent non-ascii files  #read-only architecture-dependent non-ascii files
 libdir = @libdir@  libdir = @libdir@
   libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/
 includedir = @includedir@  includedir = @includedir@
 infodir = @infodir@  infodir = @infodir@
 htmldir = @htmldir@  htmldir = @htmldir@
Line 228  GFORTH_FI_SRC = \ Line 231  GFORTH_FI_SRC = \
         hash.fs \          hash.fs \
         history.fs \          history.fs \
         intcomp.fs \          intcomp.fs \
           mkdir.fs \
         libcc.fs \          libcc.fs \
         locals.fs \          locals.fs \
         look.fs \          look.fs \
           mkdir.fs \
         quotes.fs \          quotes.fs \
         search.fs \          search.fs \
         see.fs \          see.fs \
Line 254  GFORTH_FI_SRC = \ Line 259  GFORTH_FI_SRC = \
         arch/mips/testasm.fs arch/mips/testdisasm.fs \          arch/mips/testasm.fs arch/mips/testdisasm.fs \
         arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs          arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs
   
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \  LIBCC_SRC = cstr.fs unix/socket.fs
   
   LIBCC_DIST_SRC = libffi.fs fflib.fs $(LIBCC_SRC)
   
   LIBCC_BUILD_SRC = @LIBCC_BUILD_SRC@ $(LIBCC_SRC)
   
   FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_DIST_SRC) \
         ans-report.fs ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         colorize.fs comp-i.fs complex.fs \          colorize.fs comp-i.fs complex.fs \
         depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \          depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \
Line 274  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 285  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         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 \
         add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \          add.fs lib.fs oldlib.fs sieve.fs \
         endtry-iferror.fs recover-endtry.fs          endtry-iferror.fs recover-endtry.fs
   
 COMPAT = compat/README \  COMPAT = compat/README \
Line 298  ALLSUBDIRS = engine Line 309  ALLSUBDIRS = engine
   
 ARCHS = \  ARCHS = \
         arch/generic/machine.h \          arch/generic/machine.h \
         arch/generic/128bit.h \  
         arch/m68k/machine.h \          arch/m68k/machine.h \
         arch/mips/machine.h \          arch/mips/machine.h \
         arch/386/machine.h \          arch/386/machine.h \
Line 310  ARCHS = \ Line 320  ARCHS = \
         arch/alpha/machine.h \          arch/alpha/machine.h \
         arch/arm/machine.h \          arch/arm/machine.h \
         arch/arm/cacheflush0.c \          arch/arm/cacheflush0.c \
         arch/arm/cacheflush1.c \          arch/arm/cacheflush-linux.c \
         arch/arm/cacheflush2.c \  
         arch/ia64/machine.h \          arch/ia64/machine.h \
         arch/ia64/flush_icache_block.c \          arch/ia64/flush_icache_block.c \
         arch/amd64/machine.h \          arch/amd64/machine.h \
Line 346  ARCHS = \ Line 355  ARCHS = \
         arch/sharc/types.h \          arch/sharc/types.h \
         arch/sharc/g21k-3.3.4-bp1.diff \          arch/sharc/g21k-3.3.4-bp1.diff \
         arch/r8c/asm.fs \          arch/r8c/asm.fs \
         arch/r8c/asm-test.fs \          arch/r8c/mach.fs \
         arch/r8c/prim.fs \          arch/r8c/prim.fs
         arch/r8c/errors.fs \  
         arch/r8c/tt.fs \  
         arch/r8c/tasker.fs \  
         arch/r8c/lauflicht.fs \  
         arch/r8c/terminal.fs \  
         arch/r8c/mach.fs  
   
 #not included in distribution until distribution terms are included:  #not included in distribution until distribution terms are included:
 ARCHS_NO_DIST = \  ARCHS_NO_DIST = \
Line 370  ARCHS_NO_DIST = \ Line 373  ARCHS_NO_DIST = \
         arch/c165/mach.fs \          arch/c165/mach.fs \
         arch/c165/prim.fs \          arch/c165/prim.fs \
         arch/h8/asm.fs \          arch/h8/asm.fs \
           arch/r8c/asm-test.fs \
           arch/r8c/errors.fs \
           arch/r8c/lauflicht.fs \
           arch/r8c/tasker.fs \
           arch/r8c/terminal.fs \
           arch/r8c/tt.fs \
         arch/sharc/unistd.h          arch/sharc/unistd.h
   
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
Line 385  VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen- Line 394  VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen-
 ENGINE_SOURCES = engine/Makefile.in engine/config.h.in \  ENGINE_SOURCES = engine/Makefile.in engine/config.h.in \
         engine/engine.c engine/main.c \          engine/engine.c engine/main.c \
         engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \          engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \
         engine/profile.c \          engine/profile.c engine/128bit.h \
         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/rint.c \          engine/ecvt.c engine/memcmp.c engine/rint.c \
         engine/strtol.c engine/strtoul.c \          engine/strtol.c engine/strtoul.c \
Line 396  ENGINE_SOURCES = engine/Makefile.in engi Line 405  ENGINE_SOURCES = engine/Makefile.in engi
         engine/makefile.dos engine/makefile.os2          engine/makefile.dos engine/makefile.os2
   
 SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \  SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
         gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \          gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
         configure.in configure config.sub config.guess elisp-comp missing \          autogen.sh configure.in configure config.sub config.guess \
         stamp-h.in envos.fs.in \          elisp-comp missing 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.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \          COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
Line 414  SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) c Line 423  SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) c
         $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \          $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
         timings.sc \          timings.sc \
         test/coretest.out test/checkans.out test/gforth.out \          test/coretest.out test/checkans.out test/gforth.out \
         cache-fast*.vmg          cache*.vmg peeprules.vmg prim
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
Line 422  ENGINES = gforth$(EC)$(EXE) gforth-ditc$ Line 431  ENGINES = gforth$(EC)$(EXE) gforth-ditc$
   
 ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE)   ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
   
 GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc  GEN = $(ENGINES) $(ENGINES_FAST) 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 455  KERNLS = kernl16b$(EC).fi- kernl16l$(EC) Line 464  KERNLS = kernl16b$(EC).fi- kernl16l$(EC)
          kernl32b$(EC).fi- kernl32l$(EC).fi- \           kernl32b$(EC).fi- kernl32l$(EC).fi- \
          kernl64b$(EC).fi- kernl64l$(EC).fi-           kernl64b$(EC).fi- kernl64l$(EC).fi-
   
   # -------------        Make forth images
 GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \
         doc/gforth.texi doc/gforth.dvi doc/gforth.ps \          doc/gforth.texi doc/gforth.dvi doc/gforth.ps \
         doc/vmgen.dvi doc/vmgen.ps \          doc/vmgen.dvi doc/vmgen.ps \
Line 483  kernel/version.fs: version Line 493  kernel/version.fs: version
   
 more:   $(ENGINES) $(FORTH_GEN) $(GEN)  more:   $(ENGINES) $(FORTH_GEN) $(GEN)
         @$(MAKE) check          @$(MAKE) check
         @$(FORTH_FAST) --diag -e bye  
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 526  distclean: clean Line 535  distclean: clean
                 -$(RM) -rf config.cache config.log config.status \                  -$(RM) -rf config.cache config.log config.status \
                 engine/config.h Makefile Makedist engine/Makefile \                  engine/config.h Makefile Makedist engine/Makefile \
                 stamp-h engine/stamp-h \                  stamp-h engine/stamp-h \
                 doc/version.texi gforthmi vmgen \                  doc/version.texi gforthmi vmgen preforth \
                 prim-fast.b $(FORTH_GEN_ENGINE_FAST)                  prim-fast.b $(FORTH_GEN_ENGINE_FAST)
   
 #realclean is useless, but dangerous, so it's commented out  #realclean is useless, but dangerous, so it's commented out
 realclean:      distclean  realclean:      distclean
                 -$(RM) $(GEN_PRECIOUS)                  -$(RM) -rf $(GEN_PRECIOUS) `cat .cvsignore`
   
 #mostlyclean, but also remove some of the stuff that is distributed  #mostlyclean, but also remove some of the stuff that is distributed
 virtualclean:   mostlyclean  virtualclean:   mostlyclean
                 -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \                  -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \
                 gforth-$(VERSION).tar.gz config.cache *~ */*~                  gforth-$(VERSION).tar.gz config.cache *~ */*~
   
   maintainer-clean: realclean
   
 #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the  #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the
 #Makefile if it contains our dist rules.  Therefore we have put these  #Makefile if it contains our dist rules.  Therefore we have put these
 #rules in Makedist (you can use them with GNU make on these systems).  #rules in Makedist (you can use them with GNU make on these systems).
Line 606  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 617  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) gforth.el $(DESTDIR)$(emacssitelispdir); \
                         $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \                          $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \
                 else \                  else \
                         echo ">>>>>Please install gforth.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
                 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 -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) libccdir=$(libccdir) 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
                 $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)                  $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)
                   for i in $(LIBCC_BUILD_SRC); do @GNU_LIBTOOL@ --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; done
                 $(POST_INSTALL)                  $(POST_INSTALL)
                 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info                  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info
                 #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info                  #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info
Line 624  install-strip: install Line 637  install-strip: install
   
 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); do \                  for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \
                         $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \                          $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
                 done                  done
                 for i in $(CVSDIRS); do \                  for i in $(CVSDIRS); do \
Line 639  uninstall: FORCE Line 652  uninstall: FORCE
                 -$(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/$(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)
                 @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-libcc-named: $(LIBCC_BUILD_SRC)
                   $(RMTREE) lib/gforth/$(VERSION)/libcc-named/
                   for i in $(LIBCC_BUILD_SRC); do ./gforth -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\" $(libccdir)\" ; is replace-rpath" $$i -e bye; done
   
   check:          gforths gforth.fi 
                 $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
                   $(MAKE) check-libcc-named
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
                   ./gforth-fast --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>&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
Line 685  all-bench allbench: Line 704  all-bench allbench:
         ./gforth-itc onebench.fs          ./gforth-itc onebench.fs
         ./gforth-ditc onebench.fs          ./gforth-ditc onebench.fs
   
 # ------------- Bootstrapping  
 bootstrap:  
         [ ! -z "${BOOTFORTH}" ] && \  
         ${MAKE} BUILDFORTH="${BOOTFORTH}" FORTHP="${BOOTFORTH}" engine/prim.i ${BKERNLS}  
   
 # ------------- Make forth images  # ------------- Make forth images
   
 # How to make new images:  # How to make new images:
Line 701  bootstrap: Line 715  bootstrap:
 #    these are the ones we want to use now  #    these are the ones we want to use now
   
 kernl16l$(EC).fi-:      $(KERN_DEPS) mach16l.fs  kernl16l$(EC).fi-:      $(KERN_DEPS) mach16l.fs
                 $(FORTHB) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl16b$(EC).fi-:      $(KERN_DEPS) mach16b.fs  kernl16b$(EC).fi-:      $(KERN_DEPS) mach16b.fs
                 $(FORTHB) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32l$(EC).fi-:      $(KERN_DEPS) mach32l.fs  kernl32l$(EC).fi-:      $(KERN_DEPS) mach32l.fs
                 $(FORTHB) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach32l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl32b$(EC).fi-:      $(KERN_DEPS) mach32b.fs  kernl32b$(EC).fi-:      $(KERN_DEPS) mach32b.fs
                 $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach32b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl32b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64l$(EC).fi-:      $(KERN_DEPS) mach64l.fs  kernl64l$(EC).fi-:      $(KERN_DEPS) mach64l.fs
                 $(FORTHB) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach64l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64l$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl64b$(EC).fi-:      $(KERN_DEPS) mach64b.fs  kernl64b$(EC).fi-:      $(KERN_DEPS) mach64b.fs
                 $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"                  $(PREFORTH) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b$(EC).fi- $(bindir)/gforth-$(VERSION) bye"
   
 #Solaris make does not like that:  #Solaris make does not like that:
 @GNUMAKE@kernl-%.fi:    arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  @GNUMAKE@kernl-%.fi:    arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
 @GNUMAKE@               $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"  @GNUMAKE@               $(PREFORTH) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
 @GNUMAKE@               if [ -f `echo $< | sed s/fs/sh/` ]; \  @GNUMAKE@               if [ -f `echo $< | sed s/fs/sh/` ]; \
 @GNUMAKE@               then sh `echo $< | sed s/fs/sh/` $@; \  @GNUMAKE@               then sh `echo $< | sed s/fs/sh/` $@; \
 @GNUMAKE@               else $(CP) $@- $@; \  @GNUMAKE@               else $(CP) $@- $@; \
Line 758  kernl64l$(EC).fi: $(KERNLS) Line 772  kernl64l$(EC).fi: $(KERNLS)
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs  gforth.fi:      $(kernel_fi) gforthmi 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 bindir=`pwd` ./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` libccdir=`pwd`/lib/gforth/$(VERSION)/libcc-named/ ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
Line 771  prim-fast.b: prim cache-fast$(STACK_CACH Line 785  prim-fast.b: prim cache-fast$(STACK_CACH
                 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
                 GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast                  GFORTH="$(PREFORTH)" $(srcdir)/gfgen -fast
   
 $(FORTH_GEN_ENGINE): prim.b prims2x.fs  $(FORTH_GEN_ENGINE): prim.b prims2x.fs
                 GFORTH="$(FORTHP)" $(srcdir)/gfgen                  GFORTH="$(PREFORTH)" $(srcdir)/gfgen
   
 engine/prim-s.i: engine/prim.i  engine/prim-s.i: engine/prim.i
         grep -v '^#line ' $(srcdir)/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" >>$@-                  $(PREFORTH) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 kernel/prim.fs: prim.b prims2x.fs kernel/prim0.fs  kernel/prim.fs: prim.b prims2x.fs kernel/prim0.fs
                 $(CP) kernel/prim0.fs kernel/prim.fs-                  $(CP) kernel/prim0.fs kernel/prim.fs-
                 $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@-                  $(PREFORTH) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth ' output-forth-combined process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 799  MAKELINE-noll-reg = OPT=-noll-reg OPTDEF Line 813  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  gforth$(OPT)$(EC)$(EXE): $(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}$(EC)$(EXE) $@ && break; done; \
         else \          else \
                 ( cd engine && $(MAKE) $@ ) && \                  ( cd engine && $(MAKE) $@ ) && \
                 $(CP) gforth$(OPT)$(EC)$(EXE) gforth~; \  
                 $(CP) engine/$@ $@ && \                  $(CP) engine/$@ $@ && \
                 $(MASSAGE_EXE) $@; \                  $(MASSAGE_EXE) $@; \
                 @GFORTH_EXE@; \                  @GFORTH_EXE@; \
Line 851  gforths: $(ENGINES) $(ENGINES_FAST) Line 864  gforths: $(ENGINES) $(ENGINES_FAST)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
 %.c:            %.pri prim2cl.fs  .SUFFIXES:      .c .pri
   
   .pri.c:         $< prim2cl.fs
                 $(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@                  $(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@
   
 %.so:           %.c  .c.so:          $<
                 $(GCC) -shared $(CFLAGS) $< -o $@                  $(GCC) -shared $(CFLAGS) $(CPPFLAGS) $< -o $@
   
 # ------------- Make Documentation  # ------------- Make Documentation
   
Line 880  gforth.tags: @kernel_fi@ gforth$(EC)$(EX Line 895  gforth.tags: @kernel_fi@ gforth$(EC)$(EX
                 rm tags                  rm tags
   
 prim.TAGS:      prim.b prims2x.fs  prim.TAGS:      prim.b prims2x.fs
                 $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye"|sed 's#^./prim#prim#' >$@-                  $(PREFORTH) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye"|sed 's#^./prim#prim#' >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 prim.tags:      prim.b prims2x.fs  prim.tags:      prim.b prims2x.fs
                 #echo '2c\' >prim.TAGS.sed                  #echo '2c\' >prim.TAGS.sed
                 #echo $(srcdir)/prim >>prim.TAGS.sed                  #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 >$@-                  #$(PREFORTH) 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-vi-tag dup process-file bye" >$@-                  $(PREFORTH) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-vi-tag dup process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 900  kernel.tags: Line 915  kernel.tags:
   
 #elc files  #elc files
 gforth.elc:     gforth.el  gforth.elc:     gforth.el
                 emacs -batch -f batch-byte-compile $<                  -$(EMACS) -batch -f batch-byte-compile gforth.el
   
 #Documentation  #Documentation
   
Line 910  doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_S Line 925  doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_S
 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
   
 doc/gforth.texi:        doc/gforth.ds prim.b ds2texi.fs prims2x.fs \  doc/gforth.texi: doc/gforth.ds prim.b ds2texi.fs prims2x.fs \
                 doc/doc.fd doc/crossdoc.fd                  doc/doc.fd doc/crossdoc.fd
                 $(FORTHP) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@-                  $(PREFORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd -e "s\" $(srcdir)/doc/gforth.ds\" r/o open-file throw ds2texi bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 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                  -grep doc- doc/gforth.texi| grep -v '^@c'
   
 dvi:            doc/gforth.dvi doc/vmgen.dvi  dvi:            doc/gforth.dvi doc/vmgen.dvi
   
Line 988  engine/config.h: stamp-h Line 1003  engine/config.h: stamp-h
 stamp-h: engine/config.h.in config.status stamp-h.in  stamp-h: engine/config.h.in config.status stamp-h.in
         ./config.status          ./config.status
   
 Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec:  Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in  Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in
         ./config.status          ./config.status
   
 config.status: configure  config.status: configure
Line 1003  makefile.os2 engine/makefile.os2: mkos2m Line 1018  makefile.os2 engine/makefile.os2: mkos2m
         sed -f mkos2mf.sed <Makefile.in >makefile.os2          sed -f mkos2mf.sed <Makefile.in >makefile.os2
         sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2          sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2
         echo '%.o:      %.c' >>makefile.os2          echo '%.o:      %.c' >>makefile.os2
         echo '          $$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2          echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
         echo '%.o:      %.c' >>engine/makefile.os2          echo '%.o:      %.c' >>engine/makefile.os2
         echo '          $$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2          echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2

Removed from v.1.385  
changed lines
  Added in v.1.425


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