Diff for /gforth/Makefile.in between versions 1.136 and 1.150

version 1.136, 1998/12/22 23:11:29 version 1.150, 1999/03/20 09:20:31
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)
 FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$\~+$(PATHSEP)$(srcdir) -i $(kernel_fi)  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)
 FORTHK  = ./gforth $(FORTHKFLAGS)  FORTHK  = ./gforth $(FORTHKFLAGS)
 FORTHP  = ./gforth --die-on-signal -i ./$(kernel_fi)  FORTHP  = ./gforth --die-on-signal -i ./$(kernel_fi)
 STRIP   = strip  STRIP   = strip
Line 106  man1dir= $(mandir)/man1 Line 110  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 166  EC_SRC = \ Line 171  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 207  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 213  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         doc/makedoc.fs \          doc/makedoc.fs \
         mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \          mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \
         machpc.fs more.fs other.fs prims2x.fs random.fs \          machpc.fs more.fs other.fs prims2x.fs random.fs \
         siteinit.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 \
Line 286  SOURCES = $(CVSDIRS) compat Makefile.in Line 292  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 \
Line 302  SOURCES = $(CVSDIRS) compat Makefile.in Line 308  SOURCES = $(CVSDIRS) compat Makefile.in
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs version-stamp  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 311  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor Line 317  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@   FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ 
   
 #distributed documentation  #distributed documentation
 DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.txt doc/gforth.ps  DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps
   
 #stuff in a binonly distribution   
 BINONLYDIST = config.status Makefile Makedist gforth$(EXE) gforth-ditc$(EXE) \  
         $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\  
         arch/$(machine)/machine.h engine/config.h engine/Makefile \  
         stamp-h kernel/version.fs version-stamp \  
         INSTALL.BINDIST  
   
 KERNLS = kernl16b.fi- kernl16l.fi- \  KERNLS = kernl16b.fi- kernl16l.fi- \
          kernl32b.fi- kernl32l.fi- \           kernl32b.fi- kernl32l.fi- \
Line 349  kernel/version.fs: version Line 348  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 372  mostlyclean: FORCE Line 371  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 426  binonlydist: Makedist FORCE Line 434  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 439  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 451  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 -i $(kernel_fi)" GFORTH="./gforth-ditc -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.fs" ./gforthmi gforth.fi $(FORTHSIZES) startup.fs #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
                 @if test -d $(emacssitelispdir); then \                  @if test -d "$(emacssitelispdir)"; then \
                         $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \                          $(INSTALL_DATA) $(srcdir)/gforth.el $(emacssitelispdir); \
                 else \                  else \
                         echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \                          echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
Line 453  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 465  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 474  check test: gforth$(EXE) gforth.fi Line 488  check test: gforth$(EXE) gforth.fi
                 @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 "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 584  gforth$(EXE):  engines Line 598  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
                 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
   

Removed from v.1.136  
changed lines
  Added in v.1.150


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