Diff for /gforth/Makefile.in between versions 1.144 and 1.156

version 1.144, 1999/01/10 22:00:22 version 1.156, 1999/05/18 15:25:29
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)$(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@
 FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)  FORTH_ARGS = --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
 ENGINE = ./gforth  ENGINE = ./gforth
Line 70  FORTH = $(ENGINE) $(FORTH_ARGS) Line 70  FORTH = $(ENGINE) $(FORTH_ARGS)
 ENGINE_FAST = $(ENGINE)-fast  ENGINE_FAST = $(ENGINE)-fast
 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  = ./gforth $(FORTHKFLAGS)  FORTHK  = $(ENGINE) $(FORTHKFLAGS)
 FORTHP  = ./gforth --die-on-signal -i ./$(kernel_fi)  FORTHP  = $(ENGINE) --die-on-signal -i ./$(kernel_fi)
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi  TEXI2DVI = texi2dvi
 DVI2PS  = dvips -Z  DVI2PS  = dvips -Z
Line 86  XDEFINES = @DEFS@ Line 86  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 123  CVSDIRS = CVS engine/CVS kernel/CVS doc/ Line 123  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 138  KERN_SRC = \ Line 140  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 171  EC_SRC = \ Line 173  EC_SRC = \
   
 GFORTH_FI_SRC = \  GFORTH_FI_SRC = \
         assert.fs \          assert.fs \
           backtrace.fs \
         blocked.fb \          blocked.fb \
         blocks.fs \          blocks.fs \
         bufio.fs \          bufio.fs \
Line 210  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 213  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         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 \
         doc/makedoc.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 \          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 291  SOURCES = $(CVSDIRS) compat Makefile.in Line 294  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 \
Line 347  kernel/version.fs: version Line 350  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 370  mostlyclean: FORCE Line 373  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) \                  -$(RM) -rf $(GEN) engine/gforth$(EXE) \
                 engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) \                  engine/gforth-fast$(EXE) engine/gforth-ditc$(EXE) \
Line 427  binonlydist: Makedist FORCE Line 438  binonlydist: Makedist FORCE
 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 $(siteforthdir)/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)                  $(INSTALL_PROGRAM) -s gforth-fast$(EXE) $(bindir)/gforth-fast-$(VERSION)$(EXE)
                 $(LN_S) $(bindir)/gforth-fast-$(VERSION)$(EXE) $(bindir)/gforth-fast$(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 475  check test: gforth$(EXE) gforth.fi Line 488  check test: gforth$(EXE) gforth.fi
                 @echo "Expect 'Missing: EDITOR FORGET'"                  @echo "Expect 'Missing: EDITOR FORGET'"
                 $(FORTH) code.fs test/checkans.fs -e bye                  $(FORTH) code.fs test/checkans.fs -e bye
                 @echo 'Expect no differences'                  @echo 'Expect no differences'
                 $(FORTHK) -m 100000 prims2x.fs -e "s\" $(srcdir)/prim.b\"' output-c process-file bye"| diff -c - $(srcdir)/engine/prim.i                  $(FORTHK) -m 100000 prims2x.fs -e \
                     "c-flag on s\" $(srcdir)/prim.b\" ' output-c process-file bye"| \
                     diff -c - $(srcdir)/engine/prim.i
   
 bench:          gforth-fast$(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)'
Line 486  bench:  gforth-fast$(EXE) gforth.fi Line 501  bench:  gforth-fast$(EXE) gforth.fi
   
 # ------------- 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 495  bench:  gforth-fast$(EXE) gforth.fi Line 510  bench:  gforth-fast$(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 561  prim.b:  prim Line 576  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 625  prim.TAGS:  prim.b prims2x.fs Line 640  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 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

Removed from v.1.144  
changed lines
  Added in v.1.156


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