Diff for /gforth/Makefile.in between versions 1.85 and 1.93

version 1.85, 1997/02/12 00:25:32 version 1.93, 1997/03/23 21:22:02
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995, 1996 Free Software Foundation, Inc.  #Copyright (C) 1995-1997 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 25 Line 25
   
 #gforth version  #gforth version
 VERSION_MAJOR=0  VERSION_MAJOR=0
 VERSION_MINOR=2  VERSION_MINOR=3
 VERSION_RELEASE=9  VERSION_RELEASE=0
 VERSION =$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)  VERSION =$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
 DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE)  DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE)
 SHELL   = /bin/sh  SHELL   = /bin/sh
Line 44  PATHSEP = @PATHSEP@ Line 44  PATHSEP = @PATHSEP@
 FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP).  FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP).
 FORTHSIZES = @FORTHSIZES@  FORTHSIZES = @FORTHSIZES@
 FORTH   = ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir)  FORTH   = ./gforth -p $(FORTHPATH)$(PATHSEP)$(srcdir)
 FORTHK  = ./gforth -p .$(PATHSEP)$(srcdir) -i ./kernel.fi  FORTHKFLAGS= -p .$(PATHSEP)$(srcdir) -i ./kernel.fi
   FORTHK  = ./gforth $(FORTHKFLAGS)
 FORTHP  = ./gforth -i ./kernel.fi  FORTHP  = ./gforth -i ./kernel.fi
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi  TEXI2DVI = texi2dvi
Line 88  KERN_SRC = \ Line 89  KERN_SRC = \
         aliases.fs \          aliases.fs \
         args.fs \          args.fs \
         conditionals.fs \          conditionals.fs \
           cond-old.fs \
         cross.fs \          cross.fs \
         errore.fs \          errore.fs \
         files.fs \          files.fs \
Line 133  GFORTH_FI_SRC = \ Line 135  GFORTH_FI_SRC = \
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) \
         ans-report.fs ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         checkans.fs \          checkans.fs \
         code.fs colorize.fs \          code.fs colorize.fs comp-image.fs \
         doskey.fs ds2texi.fs \          doskey.fs ds2texi.fs \
         etags.fs filedump.fs \          etags.fs filedump.fs \
         glosgen.fs gray.fs \          glosgen.fs gray.fs \
         makedoc.fs comp-image.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 \
         more.fs other.fs prims2x.fs random.fs \          more.fs other.fs prims2x.fs random.fs \
         sieve.fs \          sieve.fs \
         site-init.fs \          site-init.fs \
         tt.fs sokoban.fs \          tt.fs sokoban.fs \
         wordsets.fs \          wordsets.fs \
         tester.fs coretest.fs postponetest.fs dbltest.fs \          tester.fs coretest.fs postponetest.fs dbltest.fs other-tests.fs \
         bubble.fs siev.fs matrix.fs fib.fs \          bubble.fs siev.fs matrix.fs fib.fs \
         oof.fs oofsampl.fs objects.fs          oof.fs oofsampl.fs objects.fs
   
 SOURCES = CVS compat Makefile.in configure.in configure config.sub config.guess \  SOURCES = CVS compat Makefile.in gforth-makeimage \
           configure.in configure config.sub config.guess \
         acconfig.h config.h.in stamp-h.in \          acconfig.h config.h.in stamp-h.in \
         install-sh INSTALL README ToDo BUGS model COPYING Benchres \          install-sh INSTALL README ToDo BUGS model COPYING Benchres \
         gforth.ds texinfo.tex gforth.1 gforth.el \          gforth.ds texinfo.tex gforth.1 gforth.el \
Line 158  SOURCES = CVS compat Makefile.in configu Line 161  SOURCES = CVS compat Makefile.in configu
         ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c atanh.c \          ecvt.c memcmp.c strtol.c strtoul.c ansidecl.h memmove.c pow10.c atanh.c \
         strerror.c strsignal.c dblsub.c \          strerror.c strsignal.c dblsub.c \
         INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \          INSTALL.DOS makefile.dos mkdosmf.sed configure.bat dosconf.h \
         startup.dos history.dos \          gforth-makeimage.bat startup.dos history.dos mkinstalldirs \
         configure.cmd mkos2mf.sed os2conf.h makefile.os2 \          configure.cmd mkos2mf.sed os2conf.h makefile.os2 \
         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 version.fs  GEN = gforth gforth-ditc version.fs version-stamp
   
 OBJECTS = engine.o io.o main.o memcasecmp.o @LIBOBJS@ @getopt_long@  OBJECTS0 = io.o memcasecmp.o @LIBOBJS@ @getopt_long@
   OBJECTS = engine.o main.o
   OBJECTS_DITC =  engine-ditc.o main-ditc.o
   
 # things that need a working forth system to be generated  # things that need a working forth system to be generated
 FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs primitives.fs  FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs primitives.fs
Line 179  FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ Line 184  FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@
 DOCDIST = gforth.info* gforth.ps  DOCDIST = gforth.info* gforth.ps
   
 #stuff in a binonly distribution   #stuff in a binonly distribution 
 BINONLYDIST = config.status Makefile gforth $(OBJECTS) \  BINONLYDIST = config.status Makefile gforth gforth-ditc \
         machine.h config.h kernel.fi stamp-h version.h version.fs \          $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
           machine.h config.h kernel.fi \
           stamp-h version.h version.fs version-stamp \
         INSTALL.BINDIST          INSTALL.BINDIST
   
 KERNLS = kernl16b.fi- kernl16l.fi- \  KERNLS = kernl16b.fi- kernl16l.fi- \
Line 197  all: version.fs more Line 204  all: version.fs more
   
 #this rule avoids remaking everything after minor changes in Makefile.in  #this rule avoids remaking everything after minor changes in Makefile.in
 version-stamp:  Makefile.in  version-stamp:  Makefile.in
                 test x'$(VERSION)' = x`cat $@` || echo $(VERSION) >$@                  (test -r $@ && test x'$(VERSION)' = x`cat $@`) || echo $(VERSION) >$@
   
 version.h:      version-stamp  version.h:      version-stamp
                 echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@                  echo "static char gforth_version[]=\"$(VERSION)\" ;" >$@
Line 342  uninstall: Line 349  uninstall:
   
 check test:     gforth gforth.fi  check test:     gforth gforth.fi
                 $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye                  $(FORTH) tester.fs coretest.fs postponetest.fs dbltest.fs -e bye
                   $(FORTH) other-tests.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) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i                  $(FORTH) -m 100000 prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-c process-file bye"| diff -c - $(srcdir)/primitives.i
Line 355  bench:  gforth gforth.fi Line 363  bench:  gforth gforth.fi
   
 dvi:            gforth.dvi  dvi:            gforth.dvi
   
 gforth:         $(OBJECTS)  gforth:         $(OBJECTS) $(OBJECTS0)
                 -$(CP) gforth gforth~                  -$(CP) gforth gforth~
                 $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@                  $(GCC) $(LDFLAGS) $(OBJECTS) $(OBJECTS0) $(LDLIBS) -o $@
                 @MAKE_EXE@                  @MAKE_EXE@
   
   gforth-ditc:    $(OBJECTS_DITC) $(OBJECTS0)
                   $(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@
                   @MAKE_EXE@
   
   kernl16l.fi-:   $(KERN_SRC) version.fs mach16l.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach16l.fs"' main.fs -e "save-cross kernl16l.fi- $(bindir)/gforth-$(VERSION) bye"
   
   kernl16b.fi-:   $(KERN_SRC) version.fs mach16b.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach16b.fs"' main.fs -e "save-cross kernl16b.fi- $(bindir)/gforth-$(VERSION) bye"
   
   kernl32l.fi-:   $(KERN_SRC) version.fs mach32l.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach32l.fs"' main.fs -e "save-cross kernl32l.fi- $(bindir)/gforth-$(VERSION) bye"
   
   kernl32b.fi-:   $(KERN_SRC) version.fs mach32b.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach32b.fs"' main.fs -e "save-cross kernl32b.fi- $(bindir)/gforth-$(VERSION) bye"
   
   kernl64l.fi-:   $(KERN_SRC) version.fs mach64l.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach64l.fs"' main.fs -e "save-cross kernl64l.fi- $(bindir)/gforth-$(VERSION) bye"
   
   kernl64b.fi-:   $(KERN_SRC) version.fs mach64b.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach64b.fs"' main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl%.fi-:     mach%.fs $(KERN_SRC) version.fs $(FORTH_GEN0)  kernl%.fi-:     mach%.fs $(KERN_SRC) version.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" $<"' main.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" $<"' main.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye"
   
   kernl16b.fi:    $(KERNLS)
                   -$(CP) kernl16b.fi kernl16b.fi~
                   -$(CP) kernl16b.fi- kernl16b.fi
   
   kernl16l.fi:    $(KERNLS)
                   -$(CP) kernl16l.fi kernl16l.fi~
                   -$(CP) kernl16l.fi- kernl16l.fi
   
   kernl32b.fi:    $(KERNLS)
                   -$(CP) kernl32b.fi kernl32b.fi~
                   -$(CP) kernl32b.fi- kernl32b.fi
   
   kernl32l.fi:    $(KERNLS)
                   -$(CP) kernl32l.fi kernl32l.fi~
                   -$(CP) kernl32l.fi- kernl32l.fi
   
   kernl64b.fi:    $(KERNLS)
                   -$(CP) kernl64b.fi kernl64b.fi~
                   -$(CP) kernl64b.fi- kernl64b.fi
   
   kernl64l.fi:    $(KERNLS)
                   -$(CP) kernl64l.fi kernl64l.fi~
                   -$(CP) kernl64l.fi- kernl64l.fi
   
 kernl%.fi:      kernl%.fi- $(KERNLS)  kernl%.fi:      kernl%.fi- $(KERNLS)
                 -$(CP) $@ $@~                  -$(CP) $@ $@~
                 -$(CP) $< $@                  -$(CP) $< $@
                 @LINK_KERNL@  
   
 gforth.fi:      @kernel_fi@ gforth $(GFORTH_FI_SRC)  gforth.fi:      @kernel_fi@ gforth-makeimage gforth gforth-ditc $(GFORTH_FI_SRC)
                 $(FORTHK) --clear-dictionary $(FORTHSIZES) startup.fs -e "savesystem gforth.fi1 bye"                  GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" $(srcdir)/gforth-makeimage gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
                 $(FORTHK)  --clear-dictionary --offset-image $(FORTHSIZES) startup.fs -e "savesystem gforth.fi2 bye"  
                 $(FORTHK) -m 100000 startup.fs  comp-image.fs -e "comp-image gforth.fi1 gforth.fi2 gforth.fi bye"  
   
 #TAGS is a GNU standard target  #TAGS is a GNU standard target
 TAGS:           gforth.TAGS  TAGS:           gforth.TAGS
Line 388  engine.s: engine.c primitives.i prim_lab Line 439  engine.s: engine.c primitives.i prim_lab
 engine.o:       engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h  engine.o:       engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine.c                  $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/engine.c
   
   engine-ditc.o:  engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES) config.h
                   $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/engine.c
   
 main.o:         main.c machine.h threading.h $(INCLUDES) config.h version.h  main.o:         main.c machine.h threading.h $(INCLUDES) config.h version.h
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/main.c                  $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c $(srcdir)/main.c
   
   main-ditc.o:    main.c machine.h threading.h $(INCLUDES) config.h version.h
                   $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -DDOUBLY_INDIRECT -o $@ -c $(srcdir)/main.c
   
 strtoul.o:      strtoul.c strtol.c  strtoul.o:      strtoul.c strtol.c
   
 primitives.b:   primitives  primitives.b:   primitives
                 m4 -s $(srcdir)/primitives >$@                   m4 -s $(srcdir)/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) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
 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) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
 aliases.fs:     primitives.b prims2x.fs aliases0.fs  aliases.fs:     primitives.b prims2x.fs aliases0.fs
                 $(CP) aliases0.fs aliases.fs                  $(CP) aliases0.fs $@-
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@                  $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >>$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
 primitives.fs:  primitives.b prims2x.fs primitives0.fs  primitives.fs:  primitives.b prims2x.fs primitives0.fs
                 $(CP) primitives0.fs primitives.fs                  $(CP) primitives0.fs primitives.fs-
                 $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >>$@                  $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >>$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
 primitives.TAGS: primitives.b prims2x.fs  primitives.TAGS: primitives.b prims2x.fs
                 $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@                  $(FORTHK) prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' output-tag process-file bye" >$@-
                   $(CP) $@- $@
                   $(RM) $@-
   
 doc.fd:         makedoc.fs float.fs search-order.fs glocals.fs environ.fs \  doc.fd:         makedoc.fs $(GFORTH_FI_SRC)
                  toolsext.fs wordinfo.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  
                 $(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye                  $(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
   
 crossdoc.fd:    $(KERN_SRC) version.fs $(FORTH_GEN0)  crossdoc.fd:    $(KERN_SRC) version.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach32l.fs"' main.fs -e bye                  $(FORTHK) -e 's" mach32l.fs"' main.fs -e bye
   
 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) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@                  $(FORTHK) -m 100000 ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd -e "s\" $(srcdir)/gforth.ds\" r/o open-file throw ds2texi bye" >$@-
                   $(CP) $@- $@
 checkdoc:       gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs                  $(RM) $@-
                 $(FORTHK) ds2texi.fs answords.fs -e bye  
   checkdoc:       gforth.ds primitives.b ds2texi.fs prims2x.fs doc.fd crossdoc.fd answords.fs gforth.texi
                   $(FORTHK) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/primitives.b\" ' register-doc process-file" crossdoc.fd doc.fd answords.fs -e bye
                   -grep unknown gforth.texi
   
 dvi:            gforth.dvi  dvi:            gforth.dvi
   

Removed from v.1.85  
changed lines
  Added in v.1.93


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