Diff for /gforth/Makefile.in between versions 1.40 and 1.48

version 1.40, 1995/11/13 18:37:10 version 1.48, 1995/12/11 13:15:19
Line 34  INSTALL = @INSTALL@ Line 34  INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@  INSTALL_DATA = @INSTALL_DATA@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 GCC     = gcc  GCC     = @CC@
 CC      = $(GCC)  CC      = $(GCC)
 FORTH   = ./gforth  FORTH   = ./gforth
 FORTHK  = $(FORTH) -p . -i kernal.fi  FORTHK  = $(FORTH) -i ./kernal.fi
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi  TEXI2DVI = texi2dvi
 DVI2PS  = dvips -D300  DVI2PS  = dvips -D300
Line 47  MAKEINFO = makeinfo Line 47  MAKEINFO = makeinfo
 XCFLAGS = @CFLAGS@  XCFLAGS = @CFLAGS@
 XDEFINES = @DEFS@  XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions  SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS =  -fno-defer-pop -fcaller-saves  ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@  DEBUGFLAG = @DEBUGFLAG@
 CFLAGS  = $(DEBUGFLAG) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(datadir)/gforth/$(VERSION):$(libdir)/gforth/$(VERSION):.\"  CFLAGS  = $(DEBUGFLAG) -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(libdir)/gforth/site-forth:$(datadir)/gforth/site-forth:$(libdir)/gforth/$(VERSION):$(datadir)/gforth/$(VERSION):.\"
   
 #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 81  FORTH_SRC = anslocal.fs add.fs assert.fs Line 81  FORTH_SRC = anslocal.fs add.fs assert.fs
         kernal.fs locals-test.fs look.fs main.fs makedoc.fs \          kernal.fs locals-test.fs look.fs main.fs 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 \
         other.fs prims2x.fs random.fs search-order.fs see.fs sieve.fs source.fs \          other.fs prims2x.fs random.fs search-order.fs see.fs sieve.fs source.fs \
         startup.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs vt100.fs \          startup.fs site-init.fs struct.fs tools.fs toolsext.fs tt.fs vars.fs \
         vt100key.fs wordinfo.fs wordsets.fs \          vt100.fs vt100key.fs wordinfo.fs wordsets.fs \
         tester.fs coretest.fs \          tester.fs coretest.fs \
         bubble.fs siev.fs matrix.fs fib.fs          bubble.fs siev.fs matrix.fs fib.fs
   
Line 94  SOURCES = Makefile.in configure.in confi Line 94  SOURCES = Makefile.in configure.in confi
         getopt.c getopt1.c getopt.h select.c \          getopt.c getopt1.c getopt.h select.c \
         ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \          ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c \
         strerror.c strsignal.c \          strerror.c strsignal.c \
         makefile.dos mkdosmf.sed configure.bat startup.dos \          INSTALL.DOS makefile.dos mkdosmf.sed configure.bat \
           startup.dos history.dos \
         glosgen.glo glossaries.doc \          glosgen.glo glossaries.doc \
         $(INCLUDES) $(FORTH_SRC)          $(INCLUDES) $(FORTH_SRC)
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 GEN = gforth  GEN = gforth version.fs
   
 OBJECTS = engine.o io.o main.o @LIBOBJS@ @getopt_long@  OBJECTS = engine.o io.o main.o @LIBOBJS@ @getopt_long@
   
Line 113  FORTH_GEN1 = $(FORTH_GEN0) @kernal_fi@ Line 114  FORTH_GEN1 = $(FORTH_GEN0) @kernal_fi@
 #distributed documentation  #distributed documentation
 DOCDIST = gforth.texi gforth.fns gforth.ps gforth.info*  DOCDIST = gforth.texi gforth.fns gforth.ps gforth.info*
   
 KERNLS = kernl16b.fi+ kernl16l.fi+ \  KERNLS = kernl16b.fi- kernl16l.fi- \
          kernl32b.fi+ kernl32l.fi+ \           kernl32b.fi- kernl32l.fi- \
          kernl64b.fi+ kernl64l.fi+           kernl64b.fi- kernl64l.fi-
   
 GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gforth.texi gforth.dvi gforth.ps Makefile configure  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gforth.texi gforth.dvi gforth.ps Makefile configure
   
Line 123  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf Line 124  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gf
 .SUFFIXES:  .SUFFIXES:
 .SUFFIXES: .c .o  .SUFFIXES: .c .o
   
 all:  all:    version.fs more
         if [ ! -f gforth ]; then $(MAKE) first; fi  
         $(MAKE) more  
   
 first:  gforth  version.c:      Makefile.in
                   echo "char gforth_version[]=\"$(VERSION)\" ;" >$@
   
   version.fs:     Makefile.in
                   $(MAKE) gforth
                   echo ": version-string s\" $(VERSION)\" ;" >$@
   
 more:   $(FORTH_GEN) gforth  more:   $(FORTH_GEN) gforth
   
Line 142  more: $(FORTH_GEN) gforth Line 146  more: $(FORTH_GEN) gforth
 # `distclean' also deletes the files made by config.  # `distclean' also deletes the files made by config.
 # `realclean' also deletes everything that could be regenerated automatically."  # `realclean' also deletes everything that could be regenerated automatically."
   
 clean:            mostlyclean:
                 -$(RM) $(GEN) *.o *.s gforth.fi                  -$(RM) -rf *.s gforth.fi *.fi~ *.fi- version.fs TAGS \
                   crossdoc.fd doc.fd gforth.aux gforth.cp gforth.cps \
                   gforth.dvi gforth.fn gforth.ky gforth.log gforth.pg \
                   gforth.toc gforth.tp gforth.vr html 
   
   clean:          mostlyclean
                   -$(RM) -rf $(GEN) *.o 
   
 distclean:      clean  distclean:      clean
                 -$(RM) machine.h kernal.fi config.cache config.log                  -$(RM) machine.h kernal.fi config.cache config.log config.status Makefile
   
 realclean:      distclean  realclean:      distclean
                 -$(RM) $(GEN_PRECIOUS)                  -$(RM) $(GEN_PRECIOUS)
   
   #mostlyclean, but also remove some of the stuff that is distributed
   virtualclean:   mostlyclean
                   -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \
                   gforth-$(VERSION).tar.gz config.cache *~
   
 dist:           $(SOURCES) $(FORTH_GEN) $(DOCDIST)  dist:           $(SOURCES) $(FORTH_GEN) $(DOCDIST)
                 -rm -rf gforth-$(VERSION)                  -rm -rf gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
Line 188  binonlydist: $(SOURCES) $(FORTH_GEN) gfo Line 203  binonlydist: $(SOURCES) $(FORTH_GEN) gfo
 # gforth manages to execute more than a few primitives  # gforth manages to execute more than a few primitives
   
 install:        gforth $(FORTH_SRC) kernal.fi gforth.fi gforth.1 gforth.info  install:        gforth $(FORTH_SRC) kernal.fi gforth.fi gforth.1 gforth.info
                 $(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION)                     $(INSTALL) -d $(bindir) $(mandir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(datadir)/gforth/site-forth
                   touch $(datadir)/gforth/site-forth/site-init.fs
                   -$(RM) $(bindir)/gforth
                 $(INSTALL_PROGRAM) -s gforth $(bindir)                  $(INSTALL_PROGRAM) -s gforth $(bindir)
                 ln -f $(bindir)/gforth $(bindir)/gforth-$(VERSION)                  ln -f $(bindir)/gforth $(bindir)/gforth-$(VERSION)
                 $(INSTALL_DATA) gforth.1 $(mandir)                  $(INSTALL_DATA) gforth.1 $(mandir)
Line 196  install: gforth $(FORTH_SRC) kernal.fi g Line 213  install: gforth $(FORTH_SRC) kernal.fi g
                 for i in $(FORTH_SRC); do \                  for i in $(FORTH_SRC); do \
                         $(INSTALL_DATA) $$i $(datadir)/gforth/$(VERSION); \                          $(INSTALL_DATA) $$i $(datadir)/gforth/$(VERSION); \
                 done                  done
                 rm gforth.fi; make gforth.fi #gforth.fi contains some path names                  $(INSTALL_DATA) kernal.fi $(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) kernal.fi gforth.fi $(libdir)/gforth/$(VERSION)                  $(FORTHK) startup.fs dumpimage.fs -e "savesystem $(libdir)/gforth/$(VERSION)/gforth.fi bye" #gforth.fi contains some path names
   
   
 #deinstall all files specific to this version of gforth  #deinstall all files specific to this version of gforth
Line 209  uninstall: Line 226  uninstall:
 check:          test  check:          test
                 touch test                  touch test
   
 test:           gforth  test:           gforth gforth.fi
                 $(FORTH) tester.fs coretest.fs -e bye                  $(FORTH) tester.fs coretest.fs -e bye
                 $(FORTH) code.fs checkans.fs -e bye                  $(FORTH) code.fs checkans.fs -e bye
                 @echo 'Expect no differences'                  @echo 'Expect no differences'
                 $(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye"| diff -c - primitives.i                  $(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye"| diff -c - primitives.i
   
 bench:          gforth  bench:          gforth 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) siev.fs -e "main bye"
                 time $(FORTH) bubble.fs -e "main bye"                  time $(FORTH) bubble.fs -e "main bye"
                 time $(FORTH) -m 1M matrix.fs -e "main bye"                  time $(FORTH) -m 160000 matrix.fs -e "main bye"
                 time $(FORTH) fib.fs -e "main bye"                  time $(FORTH) fib.fs -e "main bye"
   
 dvi:            gforth.dvi  dvi:            gforth.dvi
Line 229  gforth:  $(OBJECTS) Line 246  gforth:  $(OBJECTS)
                 $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@                  $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@
                 @MAKE_EXE@                  @MAKE_EXE@
   
 kernl16l.fi+:   $(KERN_SRC) mach16l.fs $(FORTH_GEN0)  kernl16l.fi-:   $(KERN_SRC) mach16l.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach16l.fs"' main.fs                  $(FORTHK) -p . -e 's" mach16l.fs"' main.fs
   
 kernl16b.fi+:   $(KERN_SRC) mach16b.fs $(FORTH_GEN0)  kernl16b.fi-:   $(KERN_SRC) mach16b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach16b.fs"' main.fs                  $(FORTHK) -p . -e 's" mach16b.fs"' main.fs
   
 kernl32l.fi+:   $(KERN_SRC) mach32l.fs $(FORTH_GEN0)  kernl32l.fi-:   $(KERN_SRC) mach32l.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32l.fs"' main.fs                  $(FORTHK) -p . -e 's" mach32l.fs"' main.fs
   
 kernl32b.fi+:   $(KERN_SRC) mach32b.fs $(FORTH_GEN0)  kernl32b.fi-:   $(KERN_SRC) mach32b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32b.fs"' main.fs                  $(FORTHK) -p . -e 's" mach32b.fs"' main.fs
   
 kernl64l.fi+:   $(KERN_SRC) mach64l.fs $(FORTH_GEN0)  kernl64l.fi-:   $(KERN_SRC) mach64l.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach64l.fs"' main.fs                  $(FORTHK) -p . -e 's" mach64l.fs"' main.fs
   
 kernl64b.fi+:   $(KERN_SRC) mach64b.fs $(FORTH_GEN0)  kernl64b.fi-:   $(KERN_SRC) mach64b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach64b.fs"' main.fs                  $(FORTHK) -p . -e 's" mach64b.fs"' main.fs
   
 kernl16b.fi:    $(KERNLS)  kernl16b.fi:    $(KERNLS)
                 -$(CP) kernl16b.fi kernl16b.fi~                  -$(CP) kernl16b.fi kernl16b.fi~
                 -$(CP) kernl16b.fi+ kernl16b.fi                  -$(CP) kernl16b.fi- kernl16b.fi
                 @LINK_KERNL16B@                  @LINK_KERNL16B@
   
 kernl16l.fi:    $(KERNLS)  kernl16l.fi:    $(KERNLS)
                 -$(CP) kernl16l.fi kernl16l.fi~                  -$(CP) kernl16l.fi kernl16l.fi~
                 -$(CP) kernl16l.fi+ kernl16l.fi                  -$(CP) kernl16l.fi- kernl16l.fi
                 @LINK_KERNL16L@                  @LINK_KERNL16L@
   
 kernl32b.fi:    $(KERNLS)  kernl32b.fi:    $(KERNLS)
                 -$(CP) kernl32b.fi kernl32b.fi~                  -$(CP) kernl32b.fi kernl32b.fi~
                 -$(CP) kernl32b.fi+ kernl32b.fi                  -$(CP) kernl32b.fi- kernl32b.fi
                 @LINK_KERNL32B@                  @LINK_KERNL32B@
   
 kernl32l.fi:    $(KERNLS)  kernl32l.fi:    $(KERNLS)
                 -$(CP) kernl32l.fi kernl32l.fi~                  -$(CP) kernl32l.fi kernl32l.fi~
                 -$(CP) kernl32l.fi+ kernl32l.fi                  -$(CP) kernl32l.fi- kernl32l.fi
                 @LINK_KERNL32L@                  @LINK_KERNL32L@
   
 kernl64b.fi:    $(KERNLS)  kernl64b.fi:    $(KERNLS)
                 -$(CP) kernl64b.fi kernl64b.fi~                  -$(CP) kernl64b.fi kernl64b.fi~
                 -$(CP) kernl64b.fi+ kernl64b.fi                  -$(CP) kernl64b.fi- kernl64b.fi
                 @LINK_KERNL64B@                  @LINK_KERNL64B@
   
 kernl64l.fi:    $(KERNLS)  kernl64l.fi:    $(KERNLS)
                 -$(CP) kernl64l.fi kernl64l.fi~                  -$(CP) kernl64l.fi kernl64l.fi~
                 -$(CP) kernl64l.fi+ kernl64l.fi                  -$(CP) kernl64l.fi- kernl64l.fi
                 @LINK_KERNL64L@                  @LINK_KERNL64L@
   
 gforth.fi:      @kernal_fi@ gforth startup.fs glocals.fs search-order.fs hash.fs float.fs debugging.fs environ.fs wordinfo.fs look.fs vt100.fs see.fs bufio.fs debug.fs history.fs vt100key.fs assert.fs source.fs blocks.fs struct.fs dumpimage.fs  gforth.fi:      @kernal_fi@ gforth startup.fs glocals.fs search-order.fs hash.fs float.fs debugging.fs environ.fs wordinfo.fs look.fs vt100.fs see.fs bufio.fs debug.fs history.fs vt100key.fs assert.fs source.fs blocks.fs struct.fs dumpimage.fs
Line 295  primitives.b: primitives Line 312  primitives.b: primitives
                 m4 primitives >$@                   m4 primitives >$@ 
   
 primitives.i :  primitives.b prims2x.fs  primitives.i :  primitives.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@                  $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@
   
 prim_labels.i : primitives.b prims2x.fs  prim_labels.i : primitives.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@                  $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@
   
 aliases.fs:     primitives.b prims2x.fs  aliases.fs:     primitives.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@                  $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@
   
 primitives.fs:  primitives.b prims2x.fs  primitives.fs:  primitives.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@                  $(FORTHK) -p . prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
   
 version.fs:     Makefile.in  
                 echo ": version-string s\" $(VERSION)\" ;" >$@  
   
 version.c:      Makefile.in  
                 echo "char gforth_version[]=\"$(VERSION)\" ;" >$@  
   
   
 doc.fd:         makedoc.fs float.fs search-order.fs glocals.fs environ.fs \  doc.fd:         makedoc.fs float.fs search-order.fs glocals.fs environ.fs \
                  toolsext.fs wordinfo.fs \                   toolsext.fs wordinfo.fs \
                  vt100.fs colorize.fs see.fs bufio.fs debug.fs history.fs \                   vt100.fs colorize.fs see.fs bufio.fs debug.fs history.fs \
                  doskey.fs vt100key.fs startup.fs assert.fs debugging.fs code.fs                   doskey.fs vt100key.fs startup.fs assert.fs debugging.fs code.fs
                 $(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye                  $(FORTHK) -p . -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
   
 crossdoc.fd:    $(KERN_SRC) $(FORTH_GEN0)  crossdoc.fd:    $(KERN_SRC) $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32l.fs"' main.fs                  $(FORTHK) -p . -e 's" mach32l.fs"' main.fs
   
 gforth.texi:    gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd  gforth.texi:    gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd
                 $(FORTHK) ds2texi.fs -e "s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@                  $(FORTHK) -p . ds2texi.fs -e "s\" gforth.ds\" r/o open-file throw ds2texi bye" >$@
   
 checkdoc:       gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs  checkdoc:       gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs
                 $(FORTHK) ds2texi.fs answords.fs -e bye                  $(FORTHK) -p . ds2texi.fs answords.fs -e bye
   
 gforth.dvi:     gforth.texi  gforth.dvi gforth.fns:  gforth.texi
                 $(TEXI2DVI) gforth.texi                  $(TEXI2DVI) gforth.texi
   
 gforth.ps:      gforth.dvi  gforth.ps:      gforth.dvi
Line 356  configure: configure.in Line 367  configure: configure.in
 makefile.dos: mkdosmf.sed Makefile.in  makefile.dos: mkdosmf.sed Makefile.in
         sed -f mkdosmf.sed <Makefile.in >makefile.dos          sed -f mkdosmf.sed <Makefile.in >makefile.dos
   
   history.dos: history.fs Makefile.in
           sed -e "s,~/\.gforth-history,/gforth.his,g" <history.fs >history.dos
   
 startup.dos: startup.fs Makefile.in  startup.dos: startup.fs Makefile.in
         sed -e "s/\\\\ include doskey/include doskey/g" \          sed -e "s/\\\\ include doskey/include doskey/g" \
             -e "s/include vt100key/\\\\ include vt100key/g" <$< >$@  
   
               -e "s/include vt100key/\\\\ include vt100key/g" <startup.fs >startup.dos

Removed from v.1.40  
changed lines
  Added in v.1.48


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