Diff for /gforth/Makefile.in between versions 1.28 and 1.36

version 1.28, 1995/07/06 15:57:23 version 1.36, 1995/10/26 22:48:38
Line 7 Line 7
 #To do:  #To do:
 #use $(srcdir) to make compilation in a non-srcdir possible  #use $(srcdir) to make compilation in a non-srcdir possible
   
 VERSION =0.1alpha#gforth version  VERSION =0.1beta#gforth version
 SHELL   = /bin/sh  SHELL   = /bin/sh
 RM      = rm  RM      = rm
 CP      = cp  CP      = cp
Line 18  LN_S = @LN_S@ Line 18  LN_S = @LN_S@
 GCC     = gcc  GCC     = gcc
 CC      = $(GCC)  CC      = $(GCC)
 FORTH   = ./gforth  FORTH   = ./gforth
   FORTHK  = $(FORTH) -i kernal.fi
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = tex  TEXI2DVI = texi2dvi
 DVI2PS  = dvips  DVI2PS  = dvips
 #you can get texi2html from http://asis01.cern.ch/infohtml/texi2html.html  #you can get texi2html from http://asis01.cern.ch/infohtml/texi2html.html
 TEXI2HTML = texi2html  TEXI2HTML = texi2html
Line 28  XCFLAGS = @CFLAGS@ Line 29  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 =  -fno-defer-pop -fcaller-saves
 CFLAGS  = @DEBUGFLAG@ -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(datadir)/gforth/$(VERSION):$(libdir)/gforth/$(VERSION):.\"  DEBUGFLAG = @DEBUGFLAG@
   CFLAGS  = $(DEBUGFLAG) -pipe -O4 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(datadir)/gforth/$(VERSION):$(libdir)/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)
 LDFLAGS =  @DEBUGFLAG@ @LDFLAGS@ @GCCLDFLAGS@  XLDFLAGS = @LDFLAGS@
   GCCLDFLAGS = @GCCLDFLAGS@
   LDFLAGS =  $(DEBUGFLAG) $(XLDFLAGS) $(GCCLDFLAGS)
 LDLIBS  = @LIBS@  LDLIBS  = @LIBS@
   
 prefix = @prefix@  prefix = @prefix@
Line 46  infodir = $(prefix)/info Line 50  infodir = $(prefix)/info
 mandir = $(prefix)/man/man1  mandir = $(prefix)/man/man1
   
   
 INCLUDES = forth.h io.h  INCLUDES = forth.h threading.h io.h
   
 FORTH_SRC = anslocal.fs add.fs assert.fs ansi.fs blocks.fs bufio.fs checkans.fs \  KERN_SRC = main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \
         colorize.fs cross.fs debug.fs debugging.fs doskey.fs ds2texi.fs \          errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs
   
   FORTH_SRC = anslocal.fs add.fs assert.fs ansi.fs answords.fs blocks.fs bufio.fs checkans.fs \
           code.fs colorize.fs cross.fs debug.fs debugging.fs doskey.fs ds2texi.fs \
         dumpimage.fs environ.fs errore.fs etags.fs extend.fs filedump.fs \          dumpimage.fs environ.fs errore.fs etags.fs extend.fs filedump.fs \
         float.fs glocals.fs glosgen.fs gray.fs hash.fs history.fs \          float.fs glocals.fs glosgen.fs gray.fs hash.fs history.fs \
         kernal.fs locals-test.fs look.fs main.fs makedoc.fs \          kernal.fs locals-test.fs look.fs main.fs makedoc.fs \
Line 66  SOURCES = Makefile.in configure.in confi Line 73  SOURCES = Makefile.in configure.in confi
         m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \          m68k.h mips.h 386.h hppa.h cache.c sparc.h power.h alpha.h 32bit.h \
         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 \          strerror.c strsignal.c \
         makefile.dos configure.bat startup.dos \          makefile.dos mkdosmf.sed configure.bat startup.dos \
         glosgen.glo glossaries.doc \          glosgen.glo glossaries.doc \
         $(INCLUDES) $(FORTH_SRC)          $(INCLUDES) $(FORTH_SRC)
   
Line 79  OBJECTS = engine.o io.o main.o @LIBOBJS@ Line 86  OBJECTS = engine.o io.o main.o @LIBOBJS@
   
 # 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  FORTH_GEN0 = primitives.b primitives.i prim_labels.i aliases.fs
 FORTH_GEN =  $(FORTH_GEN0) @KERNAL@   FORTH_GEN =  $(FORTH_GEN0) @KERNAL@ gforth.fi
 # this is used for antidependences,  # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @gforth_fi@   FORTH_GEN1 = $(FORTH_GEN0) @kernal_fi@ 
   
   
   KERNLS = kernl16b.fi+ kernl16l.fi+ \
            kernl32b.fi+ kernl32l.fi+ \
            kernl64b.fi+ kernl64l.fi+
   
 GEN_PRECIOUS = $(FORTH_GEN) gforth.texi gforth.dvi gforth.ps Makefile configure  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) gforth.texi gforth.dvi gforth.ps Makefile configure
   
 #standards.info recommends this:  #standards.info recommends this:
 .SUFFIXES:  .SUFFIXES:
Line 110  more: $(FORTH_GEN) gforth Line 121  more: $(FORTH_GEN) gforth
 # `realclean' also deletes everything that could be regenerated automatically."  # `realclean' also deletes everything that could be regenerated automatically."
   
 clean:            clean:          
                 -$(RM) $(GEN) *.o *.s                  -$(RM) $(GEN) *.o *.s gforth.fi
   
 distclean:      clean  distclean:      clean
                 -$(RM) machine.h gforth.fi config.cache config.log                  -$(RM) machine.h kernal.fi config.cache config.log
   
 realclean:      distclean  realclean:      distclean
                 -$(RM) $(GEN_PRECIOUS)                  -$(RM) $(GEN_PRECIOUS)
Line 123  dist:  $(SOURCES) $(FORTH_GEN) Line 134  dist:  $(SOURCES) $(FORTH_GEN)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 cp -p $(SOURCES) $(FORTH_GEN) gforth-$(VERSION)                  cp -p $(SOURCES) $(FORTH_GEN) gforth-$(VERSION)
                 tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz                  tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).tar.gz
                   -rm -rf gforth-$(VERSION)
   
 #a binary distribution contains the complete source distribution,  #a binary distribution contains the complete source distribution,
 # the objects, the executable and the links. the objects are there for making  # the objects, the executable and the links. the objects are there for making
Line 130  dist:  $(SOURCES) $(FORTH_GEN) Line 142  dist:  $(SOURCES) $(FORTH_GEN)
 bindist:        $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) config.status Makefile  bindist:        $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS) config.status Makefile
                 -rm -rf gforth-$(VERSION)                  -rm -rf gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 cp -p -d $(SOURCES) config.status Makefile $(FORTH_GEN) gforth $(OBJECTS) machine.h gforth.fi gforth-$(VERSION)                  cp -p -d $(SOURCES) config.status Makefile $(FORTH_GEN) gforth $(OBJECTS) machine.h kernal.fi gforth-$(VERSION)
                 strip gforth-$(VERSION)/gforth                  strip gforth-$(VERSION)/gforth
                 tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz                  tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz
   
Line 144  bindist: $(SOURCES) $(FORTH_GEN) gforth Line 156  bindist: $(SOURCES) $(FORTH_GEN) gforth
 binonlydist:    $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS)  binonlydist:    $(SOURCES) $(FORTH_GEN) gforth $(OBJECTS)
                 -rm -rf gforth-$(VERSION)                  -rm -rf gforth-$(VERSION)
                 mkdir gforth-$(VERSION)                  mkdir gforth-$(VERSION)
                 cp -p -d  config.status Makefile gforth $(OBJECTS) machine.h gforth.fi gforth-$(VERSION)                  cp -p -d  config.status Makefile gforth $(OBJECTS) machine.h kernal.fi gforth-$(VERSION)
                 strip gforth-$(VERSION)/gforth                  strip gforth-$(VERSION)/gforth
                 tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz                  tar cvf - gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz
   
Line 153  binonlydist: $(SOURCES) $(FORTH_GEN) gfo Line 165  binonlydist: $(SOURCES) $(FORTH_GEN) gfo
 #strip gforth, because the debugging stuff is hardly useful once  #strip gforth, because the debugging stuff is hardly useful once
 # gforth manages to execute more than a few primitives  # gforth manages to execute more than a few primitives
   
 install:        gforth $(FORTH_SRC) 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)   
                 $(INSTALL_PROGRAM) -s gforth $(bindir)                  $(INSTALL_PROGRAM) -s gforth $(bindir)
                 $(INSTALL_DATA) gforth.1 $(mandir)                  $(INSTALL_DATA) gforth.1 $(mandir)
                 $(INSTALL_DATA) gforth.info* $(infodir)                  $(INSTALL_DATA) gforth.info* $(infodir)
                 $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)  
                 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 gforth.fi $(libdir)/gforth/$(VERSION)
   
 check:          test  check:          test
                                   touch test
   
 test:           gforth  test:           gforth
                 @echo 'Expect to see INCORRECT RESULT: { GS1 -> <TRUE> <TRUE> }'                  @echo 'Expect to see INCORRECT RESULT: { GS1 -> <TRUE> <TRUE> }'
                 @echo 'This is a bug of the testing program'                  @echo 'This is a bug of the testing program'
                 $(FORTH) tester.fs coretest.fs -e bye                  $(FORTH) tester.fs coretest.fs -e bye
                 $(FORTH) startup.fs blocks.fs checkans.fs -e bye                  $(FORTH) startup.fs blocks.fs 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
   
Line 180  gforth:  $(OBJECTS) Line 194  gforth:  $(OBJECTS)
                 $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@                  $(GCC) $(LDFLAGS) $(OBJECTS) $(LDLIBS) -o $@
                 @MAKE_EXE@                  @MAKE_EXE@
   
 kernl16l.fi:    main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \  kernl16l.fi+:   $(KERN_SRC) mach16l.fs $(FORTH_GEN0)
                 errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \                  $(FORTHK) -e 's" mach16l.fs"' main.fs
                 mach16l.fs $(FORTH_GEN1)  
                 -$(CP) kernl16l.fi kernl16l.fi~  kernl16b.fi+:   $(KERN_SRC) mach16b.fs $(FORTH_GEN0)
                 $(FORTH) -e 's" mach16l.fs"' main.fs                  $(FORTHK) -e 's" mach16b.fs"' main.fs
                 @LINK_KERNL16L@  
   
 kernl16b.fi:    main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \  kernl32l.fi+:   $(KERN_SRC) mach32l.fs $(FORTH_GEN0)
                 errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \                  $(FORTHK) -e 's" mach32l.fs"' main.fs
                 mach16b.fs $(FORTH_GEN1)  
   kernl32b.fi+:   $(KERN_SRC) mach32b.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach32b.fs"' main.fs
   
   kernl64l.fi+:   $(KERN_SRC) mach64l.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach64l.fs"' main.fs
   
   kernl64b.fi+:   $(KERN_SRC) mach64b.fs $(FORTH_GEN0)
                   $(FORTHK) -e 's" mach64b.fs"' main.fs
   
   kernl16b.fi:    $(KERNLS)
                 -$(CP) kernl16b.fi kernl16b.fi~                  -$(CP) kernl16b.fi kernl16b.fi~
                 $(FORTH) -e 's" mach16b.fs"' main.fs                  -$(CP) kernl16b.fi+ kernl16b.fi
                 @LINK_KERNL16B@                  @LINK_KERNL16B@
   
 kernl32l.fi:    main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \  kernl16l.fi:    $(KERNLS)
                 errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \                  -$(CP) kernl16l.fi kernl16l.fi~
                 mach32l.fs $(FORTH_GEN1)                  -$(CP) kernl16l.fi+ kernl16l.fi
                 -$(CP) kernl32l.fi kernl32l.fi~                  @LINK_KERNL16L@
                 $(FORTH) -e 's" mach32l.fs"' main.fs  
                 @LINK_KERNL32L@  
   
 kernl32b.fi:    main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \  kernl32b.fi:    $(KERNLS)
                 errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \  
                 mach32b.fs $(FORTH_GEN1)  
                 -$(CP) kernl32b.fi kernl32b.fi~                  -$(CP) kernl32b.fi kernl32b.fi~
                 $(FORTH) -e 's" mach32b.fs"' main.fs                  -$(CP) kernl32b.fi+ kernl32b.fi
                 @LINK_KERNL32B@                  @LINK_KERNL32B@
   
 kernl64l.fi:    main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \  kernl32l.fi:    $(KERNLS)
                 errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \                  -$(CP) kernl32l.fi kernl32l.fi~
                 mach64l.fs $(FORTH_GEN1)                  -$(CP) kernl32l.fi+ kernl32l.fi
                 -$(CP) kernl64l.fi kernl64l.fi~                  @LINK_KERNL32L@
                 $(FORTH) -e 's" mach64l.fs"' main.fs  
                 @LINK_KERNL64L@  
   
 kernl64b.fi:    main.fs search-order.fs cross.fs aliases.fs vars.fs add.fs \  kernl64b.fi:    $(KERNLS)
                 errore.fs kernal.fs version.fs extend.fs tools.fs toolsext.fs \  
                 mach64b.fs $(FORTH_GEN1)  
                 -$(CP) kernl64b.fi kernl64b.fi~                  -$(CP) kernl64b.fi kernl64b.fi~
                 $(FORTH) -e 's" mach64b.fs"' main.fs                  -$(CP) kernl64b.fi+ kernl64b.fi
                 @LINK_KERNL64B@                  @LINK_KERNL64B@
   
 engine.s:       engine.c primitives.i prim_labels.i machine.h $(INCLUDES)  kernl64l.fi:    $(KERNLS)
                   -$(CP) kernl64l.fi kernl64l.fi~
                   -$(CP) kernl64l.fi+ kernl64l.fi
                   @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 blocks.fs struct.fs dumpimage.fs
                   $(FORTHK) startup.fs dumpimage.fs -e "savesystem gforth.fi bye"
   
   engine.s:       engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES)
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S engine.c                  $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -S engine.c
   
 engine.o:       engine.c primitives.i prim_labels.i machine.h $(INCLUDES)  engine.o:       engine.c primitives.i prim_labels.i machine.h threading.h $(INCLUDES)
                 $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c engine.c                  $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c engine.c
   
   main.o:         main.c machine.h threading.h $(INCLUDES)
                   $(GCC) $(CFLAGS) $(ENGINE_FLAGS) -c main.c
   
 strtoul.o:      strtoul.c strtol.c  strtoul.o:      strtoul.c strtol.c
   
 primitives.b:   primitives  primitives.b:   primitives
                 m4 primitives >$@                   m4 primitives >$@ 
   
 primitives.i :  primitives.b prims2x.fs  primitives.i :  primitives.b prims2x.fs
                 $(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-c process-file bye" >$@                  $(FORTHK) 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
                 $(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@                  $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-label process-file bye" >$@
   
 aliases.fs:     primitives.b prims2x.fs  aliases.fs:     primitives.b prims2x.fs
                 $(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@                  $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-alias process-file bye" >$@
   
 primitives.fs:  primitives.b prims2x.fs  primitives.fs:  primitives.b prims2x.fs
                 $(FORTH) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@                  $(FORTHK) prims2x.fs -e "s\" primitives.b\" ' output-forth process-file bye" >$@
   
 version.fs:     Makefile.in  version.fs:     Makefile.in
                 echo ": version-string s\" $(VERSION)\" ;" >$@                  echo ": version-string s\" $(VERSION)\" ;" >$@
Line 255  version.c: Makefile.in Line 281  version.c: Makefile.in
 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                   doskey.fs vt100key.fs startup.fs assert.fs debugging.fs code.fs
                 $(FORTH) -e "s\" doc.fd\"" makedoc.fs startup.fs -e bye                  $(FORTHK) -e "s\" doc.fd\"" makedoc.fs startup.fs code.fs -e bye
   
   crossdoc.fd:    $(KERN_SRC) $(FORTH_GEN0)
                   $(FORTHK) -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
                 $(FORTH) ds2texi.fs >$@                  $(FORTHK) 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
                   $(FORTHK) ds2texi.fs answords.fs -e bye
   
 gforth.dvi:     gforth.texi  gforth.dvi:     gforth.texi
                 $(TEXI2DVI) gforth.texi                  $(TEXI2DVI) gforth.texi
Line 283  config.status: configure Line 315  config.status: configure
         ./config.status --recheck          ./config.status --recheck
 configure: configure.in  configure: configure.in
         cd $(srcdir) && autoconf          cd $(srcdir) && autoconf
   
   makefile.dos: mkdosmf.sed Makefile.in
           sed -f mkdosmf.sed <Makefile.in >makefile.dos
   
   startup.dos: startup.fs Makefile.in
           sed -e "s/\\\\ include doskey/include doskey/g" \
               -e "s/include vt100key/\\\\ include vt100key/g" <$< >$@
   

Removed from v.1.28  
changed lines
  Added in v.1.36


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