Diff for /gforth/Makefile.in between versions 1.140 and 1.171

version 1.140, 1998/12/25 22:50:47 version 1.171, 2000/05/19 09:24:37
Line 53  osclass = @OSCLASS@ Line 53  osclass = @OSCLASS@
 SHELL   = /bin/sh  SHELL   = /bin/sh
 RM      = rm  RM      = rm
 RMTREE  = rm -rf  RMTREE  = rm -rf
 CP      = cp  CP      = cp -p
 MV      = mv  MV      = mv
 TAR     = tar cf -  TAR     = tar cf -
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
Line 62  INSTALL_DATA = @INSTALL_DATA@ Line 62  INSTALL_DATA = @INSTALL_DATA@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 GCC     = @CC@  GCC     = @CC@
 CC      = $(GCC)  CC      = $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(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@
 FORTH   = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)  FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
   ENGINE = ./gforth
   FORTH   = $(ENGINE) $(FORTH_ARGS)
   ENGINE_FAST = $(ENGINE)-fast
   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  = ./gforth $(FORTHKFLAGS)  FORTHK  = $(ENGINE) $(FORTHKFLAGS)
 FORTHP  = ./gforth --die-on-signal -i ./$(kernel_fi)  FORTHP  = $(ENGINE) --die-on-signal -i ./$(kernel_fi)
   STARTUP = -e 3 exboot.fs startup.fs
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi  TEXI2DVI = texi2dvi -e
 DVI2PS  = dvips -Z  DVI2PS  = dvips -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/  #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 TEXI2HTML = texi2html  
 MAKEINFO = makeinfo  MAKEINFO = makeinfo
   TEXI2HTML = texi2html
   
 # ------------- Compiler Flags  # ------------- Compiler Flags
   
Line 82  XDEFINES = @DEFS@ Line 87  XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions  SWITCHES = $(XCFLAGS) $(XDEFINES) #-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) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\"  CFLAGS  = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\"
   
 #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 106  man1dir= $(mandir)/man1 Line 111  man1dir= $(mandir)/man1
 man1ext= .1  man1ext= .1
 #older emacses have their site-lisp in $(libdir)/emacs/  #older emacses have their site-lisp in $(libdir)/emacs/
 emacssitelispdir=@lispdir@  emacssitelispdir=@lispdir@
   siteforthdir=$(datadir)/gforth/site-forth
   
 CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \  CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \
         compat/CVS \          compat/CVS \
Line 118  CVSDIRS = CVS engine/CVS kernel/CVS doc/ Line 124  CVSDIRS = CVS engine/CVS kernel/CVS doc/
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h  INCLUDES = engine/forth.h engine/threaded.h engine/io.h
   
 KERN_SRC = \  KERN_SRC = \
           mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
           machpc.fs \
         kernel/aliases0.fs \          kernel/aliases0.fs \
         kernel/aliases.fs \          kernel/aliases.fs \
         kernel/args.fs \          kernel/args.fs \
Line 133  KERN_SRC = \ Line 141  KERN_SRC = \
         kernel/main.fs \          kernel/main.fs \
         kernel/prim0.fs \          kernel/prim0.fs \
         search.fs \          search.fs \
         kernel/special.fs \          kernel/quotes.fs \
         kernel/tools.fs \          kernel/tools.fs \
         kernel/toolsext.fs \          kernel/toolsext.fs \
         kernel/vars.fs \          kernel/vars.fs \
Line 146  KERN_SRC = \ Line 154  KERN_SRC = \
         kernel/nio.fs \          kernel/nio.fs \
         kernel/saccept.fs \          kernel/saccept.fs \
         kernel/doers.fs \          kernel/doers.fs \
         kernel/getdoers.fs          kernel/getdoers.fs \
           kernel/pass.fs
   
 EC_SRC = \  EC_SRC = \
         asm/README \          asm/README \
Line 157  EC_SRC = \ Line 166  EC_SRC = \
         asm/target.fs \          asm/target.fs \
         ec/README \          ec/README \
         ec/mirror.fs \          ec/mirror.fs \
         ec/mirrors.fs \  
         ec/shex.fs \          ec/shex.fs \
         ec/builttag.fs \          ec/builttag.fs \
         ec/dotx.fs \          ec/dotx.fs \
         ec/mirrored.fs \  
         ec/nesting.fs          ec/nesting.fs
   
 GFORTH_FI_SRC = \  GFORTH_FI_SRC = \
         assert.fs \          assert.fs \
           backtrace.fs \
         blocked.fb \          blocked.fb \
         blocks.fs \          blocks.fs \
         bufio.fs \          bufio.fs \
         debug.fs \          debug.fs \
         debugs.fs \          debugs.fs \
           ekey.fs \
         savesys.fs \          savesys.fs \
         environ.fs \          environ.fs \
         errors.fs \          errors.fs \
           exceptions.fs \
         extend.fs \          extend.fs \
         float.fs \          float.fs \
         glocals.fs \          glocals.fs \
Line 203  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 213  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         code.fs colorize.fs comp-i.fs \          code.fs colorize.fs comp-i.fs \
         doskey.fs ds2texi.fs \          doskey.fs ds2texi.fs \
         envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \          envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
         glosgen.fs gray.fs \          glosgen.fs gray.fs httpd.fs \
         doc/makedoc.fs \          make-app.fs doc/makedoc.fs \
         mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \          more.fs other.fs prims2x.fs random.fs \
         machpc.fs more.fs other.fs prims2x.fs random.fs \          table.fs string.fs \
         siteinit.fs table.fs \  
         tt.fs sokoban.fs \          tt.fs sokoban.fs \
         unbuffered.fs wordsets.fs \          unbuffered.fs wordsets.fs \
         test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \          test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \
         test/other.fs test/checkans.fs \          test/other.fs test/checkans.fs \
         bubble.fs siev.fs matrix.fs fib.fs \          bubble.fs siev.fs matrix.fs fib.fs \
         oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs          oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
           moofglos.fs
   
 COMPAT = compat/README \  COMPAT = compat/README \
         compat/anslocal.fs \          compat/anslocal.fs \
Line 286  SOURCES = $(CVSDIRS) compat Makefile.in Line 296  SOURCES = $(CVSDIRS) compat Makefile.in
         doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \          doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \
         gforth.el \          gforth.el \
         prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \          prim engine/engine.c engine/main.c engine/io.c engine/memcmpc.c \
         $(ARCHS) \          engine/signals.c $(ARCHS) \
         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/strtol.c engine/strtoul.c \          engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \
         engine/ansidecl.h engine/memmove.c \          engine/ansidecl.h engine/memmove.c \
         engine/pow10.c engine/atanh.c engine/cleanalign.c \          engine/pow10.c engine/atanh.c engine/cleanalign.c \
         engine/strerror.c engine/strsignal.c engine/dblsub.c \          engine/strerror.c engine/strsignal.c engine/dblsub.c \
         INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \          INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \
         dosconf.h gforthmi.bat mkinstalldirs \          dosconf.h gforthmi.bat mkinstalldirs siteinit.fs \
         versions.bsh \          versions.bsh \
         configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \          configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \
         gforthmi.cmd glosgen.glo doc/glossaries.doc \          gforthmi.cmd glosgen.glo doc/glossaries.doc \
         $(INCLUDES) $(FORTH_SRC) $(COMPAT) \          $(INCLUDES) $(FORTH_SRC) $(COMPAT) \
         timings.sc          timings.sc \
           test/coretest.out test/checkans.out
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs  GEN = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) kernel/version.fs
   
 # things that need a working forth system to be generated  # things that need a working forth system to be generated
 FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs  FORTH_GEN0 = prim.b engine/prim.i engine/prim_lab.i kernel/aliases.fs kernel/prim.fs
Line 342  kernel/version.fs: version Line 353  kernel/version.fs: version
         $(MAKE) gforth$(EXE)          $(MAKE) gforth$(EXE)
         echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   engine $(FORTH_GEN) gforth$(EXE)  more:   engine $(FORTH_GEN) $(GEN)
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 365  mostlyclean: FORCE Line 376  mostlyclean: FORCE
                 doc/gforth.toc doc/gforth.tp doc/gforth.vr html \                  doc/gforth.toc doc/gforth.tp doc/gforth.vr html \
                 gforth-$(VERSION).tar.gz                  gforth-$(VERSION).tar.gz
   
   # Just the stuff needed to rebuild the documentation nac03feb1999
   docclean:       FORCE
                   -$(RM) -rf doc/crossdoc.fd doc/doc.fd doc/gforth.texi doc/gforth.fns \
                   doc/gforth.aux doc/gforth.cp doc/gforth.cps \
                   doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \
                   doc/gforth.pg \
                   doc/gforth.toc doc/gforth.tp doc/gforth.vr html
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) engine/gforth$(EXE) engine/gforth-ditc$(EXE) \                  -$(RM) -rf $(GEN) engine/gforth$(EXE) \
                   engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) \
                 *.o engine/*.o arch/*/*.o version                  *.o engine/*.o arch/*/*.o version
   
 distclean:      clean  distclean:      clean
Line 419  binonlydist: Makedist FORCE Line 439  binonlydist: Makedist FORCE
 #supplying a lot of files that can be easily generated (only info is  #supplying a lot of files that can be easily generated (only info is
 #hard to generate)  #hard to generate)
 install:        gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs  install:        gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi doc/gforth.1 prim install.TAGS installdirs
                 touch $(datadir)/gforth/site-forth/siteinit.fs                  touch $(siteforthdir)/siteinit.fs
                 -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi                  -$(RM) $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforthmi
                   -$(RM) $(bindir)/gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
                 $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)                  $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
                 $(LN_S) $(bindir)/gforth-$(VERSION)$(EXE) $(bindir)/gforth$(EXE)                  (cd $(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE))
                   $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
                   (cd $(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE))
                 $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)                  $(INSTALL_PROGRAM) gforthmi $(bindir)/gforthmi-$(VERSION)
                 $(LN_S) $(bindir)/gforthmi-$(VERSION) $(bindir)/gforthmi                  $(INSTALL_PROGRAM) gforth-ditc $(libdir)/gforth/$(VERSION)
                   (cd $(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
                 -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)                  -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
                 -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done                  -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
                 for i in $(FORTH_SRC) $(COMPAT) prim; do \                  for i in $(FORTH_SRC) $(COMPAT) prim; do \
Line 432  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 456  install: gforth$(EXE) $(FORTH_SRC) $(ker
                 done                  done
                 $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)                  $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)
                 $(RM) gforth.fi                  $(RM) gforth.fi
                 GFORTHD="./gforth-ditc -p$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #gforth.fi contains some path names                  GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) #gforth.fi contains some path names
                 $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
                   # after install, remove these because they are owned by ROOT
                   $(RM) gforth.fi install.TAGS
                 @if test -d "$(emacssitelispdir)"; then \                  @if test -d "$(emacssitelispdir)"; then \
                         $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \                          $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
                 else \                  else \
Line 446  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 472  install: gforth$(EXE) $(FORTH_SRC) $(ker
 install-strip:  install  install-strip:  install
   
 installdirs:    mkinstalldirs  installdirs:    mkinstalldirs
                 $(srcdir)/mkinstalldirs $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth                  for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \
                           $(srcdir)/mkinstalldirs $$i; \
                   done
                 for i in $(CVSDIRS); do \                  for i in $(CVSDIRS); do \
                         $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \                          $(srcdir)/mkinstalldirs $(datadir)/gforth/$(VERSION)/`dirname $$i`; \
                 done                  done
Line 459  uninstall: FORCE Line 487  uninstall: FORCE
                 @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth"                  @echo -e "To remove Gforth completely, type\n$(RM) -rf $(bindir)/gforth$(EXE) $(bindir)/gforthmi $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth"
   
 check test:     gforth$(EXE) gforth.fi  check test:     gforth$(EXE) gforth.fi
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye                  $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye | diff -c - $(srcdir)/test/coretest.out
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 @echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'"                  $(FORTH) code.fs test/checkans.fs -e bye | diff -c - $(srcdir)/test/checkans.out
                 @echo "Expect 'Missing: EDITOR FORGET'"                  $(FORTHK) -m 100000 prims2x.fs -e \
                 $(FORTH) code.fs test/checkans.fs -e bye                    "c-flag on s\" $(srcdir)/prim.b\" ' output-c process-file bye"| \
                 @echo 'Expect no differences'                    diff -c - $(srcdir)/engine/prim.i
                 $(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i  
   
 bench:          gforth$(EXE) gforth.fi  bench:          gforth-fast$(EXE) gforth.fi
                 @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'                  @echo 'Each benchmark takes about 30s on a 486-66 (gcc-2.6.3 -DFORCE_REG)'
                 time $(FORTH) siev.fs -e "main bye"                  time $(FORTH_FAST) siev.fs -e "main bye"
                 time $(FORTH) bubble.fs -e "main bye"                  time $(FORTH_FAST) bubble.fs -e "main bye"
                 time $(FORTH) -m 160000 matrix.fs -e "main bye"                  time $(FORTH_FAST) -m 160000 matrix.fs -e "main bye"
                 time $(FORTH) fib.fs -e "main bye"                  time $(FORTH_FAST) fib.fs -e "main bye"
   
 # ------------- Make forth images  # ------------- Make forth images
   
 # Hot to make new images:  # How to make new images:
 # 1. Produce an image called kernlXYZ.fi-  # 1. Produce an image called kernlXYZ.fi-
 #    the original kernel.fi is not touched because it's needed for creation  #    the original kernel.fi is not touched because it's needed for creation
 # 2. copy old kernlXYZ.fi to kernlXYZ.fi~  # 2. copy old kernlXYZ.fi to kernlXYZ.fi~
Line 485  bench:  gforth$(EXE) gforth.fi Line 512  bench:  gforth$(EXE) gforth.fi
 #    these are the ones we want to use now  #    these are the ones we want to use now
   
 kernl16l.fi-:   $(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0)  kernl16l.fi-:   $(KERN_SRC) kernel/version.fs mach16l.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach16l.fs"' kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach16l.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl16b.fi-:   $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0)  kernl16b.fi-:   $(KERN_SRC) kernel/version.fs mach16b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach16b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"
Line 502  kernl64l.fi-: $(KERN_SRC) kernel/version Line 529  kernl64l.fi-: $(KERN_SRC) kernel/version
 kernl64b.fi-:   $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)  kernl64b.fi-:   $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl-%.fi:     arch/%/mach.fs \  kernl-%.fi:     arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  
                 $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
                 if [ -f `echo $< | sed s/fs/sh/` ]; \                  if [ -f `echo $< | sed s/fs/sh/` ]; \
                 then sh `echo $< | sed s/fs/sh/` $@; \                  then sh `echo $< | sed s/fs/sh/` $@; \
                 else $(CP) $@- $@; \                  else $(CP) $@- $@; \
                 fi                  fi
   
 arch/%/mach.fs: arch/%/prim.fs  arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs
   
 arch/%/prim.fs: arch/%/asm.fs  
   
 kernl16b.fi:    $(KERNLS)  kernl16b.fi:    $(KERNLS)
                 -$(CP) kernl16b.fi kernl16b.fi~                  -$(CP) kernl16b.fi kernl16b.fi~
Line 543  kernl64l.fi: $(KERNLS) Line 567  kernl64l.fi: $(KERNLS)
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC)  gforth.fi:      $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(GFORTH_FI_SRC)
                 GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs                  GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
Line 551  prim.b:  prim Line 575  prim.b:  prim
                 m4 -s $(srcdir)/prim >$@                   m4 -s $(srcdir)/prim >$@ 
   
 engine/prim.i:          prim.b prims2x.fs  engine/prim.i:          prim.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-c process-file bye" >$@-                  $(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-c process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 engine/prim_lab.i:      prim.b prims2x.fs  engine/prim_lab.i:      prim.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-label process-file bye" >$@-                  $(FORTHK) prims2x.fs -e "c-flag on s\" prim.b\" ' output-label process-file bye" >$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 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 $@-
                 $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-alias process-file bye" >>$@-                  $(FORTHK) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias 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-
                 $(FORTHK) prims2x.fs -e "s\" prim.b\" ' output-forth process-file bye" >>$@-                  $(FORTHK) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-forth process-file bye" >>$@-
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 577  gforth$(EXE):  engines Line 601  gforth$(EXE):  engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTH_EXE@                  @GFORTH_EXE@
   
   gforth-fast$(EXE):      engines
                   $(CP) engine/$@ $@
                   @GFORTHFAST_EXE@
   
 gforth-ditc$(EXE):      engines  gforth-ditc$(EXE):      engines
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 engines:        FORCE  engines:        FORCE engine/Makefile engine/prim.i engine/prim_lab.i
                 cd engine && $(MAKE) gforth$(EXE) gforth-ditc$(EXE)                  cd engine && $(MAKE) gforth$(EXE) gforth-fast$(EXE) gforth-ditc$(EXE)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
Line 602  install.TAGS: gforth.TAGS Line 630  install.TAGS: gforth.TAGS
                 sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS                  sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS
   
 gforth.TAGS:    @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS  gforth.TAGS:    @kernel_fi@ gforth $(GFORTH_FI_SRC) prim.TAGS
                 $(FORTHK) etags.fs startup.fs -e bye                  $(FORTHK) etags.fs exceptions.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
   
Line 611  prim.TAGS:  prim.b prims2x.fs Line 639  prim.TAGS:  prim.b prims2x.fs
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.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 startup.fs code.fs objects.fs oof.fs mini-oof.fs -e bye                  $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs exceptions.fs startup.fs code.fs objects.fs oof.fs moofglos.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 643  doc/gforth.info doc/gforth.info-*: $(GFO Line 671  doc/gforth.info doc/gforth.info-*: $(GFO
 html:           $(GFORTH_TEXI)  html:           $(GFORTH_TEXI)
                 -$(RMTREE) html                  -$(RMTREE) html
                 -mkdir html                  -mkdir html
                 cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi  ### need makeinfo 4.0 to generate html. Otherwise, use texi2html..
                   cd html; $(MAKEINFO) --html -I ../doc ../doc/gforth.texi
   ###             cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi
   
 doc/gforth.txt: $(GFORTH_TEXI)  doc/gforth.txt: $(GFORTH_TEXI)
                 -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt                  -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt
   
 doc:            doc/gforth.ps html doc/gforth.txt  doc:            info doc/gforth.ps html doc/gforth.txt TAGS
   
 # For an explanation of the following Makefile rules, see node  # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.  # `Automatic Remaking' in GNU Autoconf documentation.
 $(srcdir)/configure:    configure.in aclocal.m4  
   #Note: no target "$(srcdir)/configure", because that does not trigger 
   #unless $(srcdir)!="."
   configure:      configure.in aclocal.m4
                 cd $(srcdir) && autoconf                  cd $(srcdir) && autoconf
   
 aclocal.m4:     acinclude.m4 configure.in  aclocal.m4:     acinclude.m4 configure.in

Removed from v.1.140  
changed lines
  Added in v.1.171


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