Diff for /gforth/Makefile.in between versions 1.109 and 1.113

version 1.109, 1998/05/15 17:01:02 version 1.113, 1998/07/05 20:49:58
Line 30 Line 30
   
 # ------------- gforth version  # ------------- gforth version
   
 VERSION_MAJOR=0  VERSION = @VERSION@
 VERSION_MINOR=4  DOSVERSION=`echo $VERSION|sed 's/\.//g'`
 VERSION_RELEASE=0  
 VERSION =$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)  
 DOSVERSION=$(VERSION_MAJOR)$(VERSION_MINOR)$(VERSION_RELEASE)  
   
 # ------------- System specific variables         # ------------- System specific variables       
   
 machine=@mach_h@  machine=@machine@
   kernel_fi=@kernel_fi@
   
 # this is the type of machine  # this is the type of machine
 # used to extend the include path with ./arch/$machine  # used to extend the include path with ./arch/$machine
 # so we could include a machine specific   # so we can include a machine specific 
 # machine.h file  # machine.h file
   
 PATHSEP = @PATHSEP@  PATHSEP = @PATHSEP@
Line 61  INSTALL_DATA = @INSTALL_DATA@ Line 60  INSTALL_DATA = @INSTALL_DATA@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 GCC     = @CC@  GCC     = @CC@
 CC      = $(GCC)  CC      = $(GCC)
 FORTHPATH = $(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)$(PATHSEP).  FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(datadir)/gforth/site-forth$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@  FORTHSIZES = @FORTHSIZES@
 FORTH   = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)  FORTH   = ./gforth --die-on-signal -p $(FORTHPATH)$(PATHSEP)$(srcdir)
 FORTHKFLAGS= --die-on-signal -p .$(PATHSEP)$(srcdir) -i ./kernel.fi  FORTHKFLAGS= --die-on-signal -p .$(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
 TEXI2DVI = texi2dvi  TEXI2DVI = texi2dvi
 DVI2PS  = dvips -D300  DVI2PS  = dvips -D300
Line 105  mandir = $(prefix)/man Line 104  mandir = $(prefix)/man
 man1dir= $(mandir)/man1  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=$(datadir)/emacs/site-lisp  emacssitelispdir=@lispdir@
   
 INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h  INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h
   
Line 148  EC_SRC = \ Line 147  EC_SRC = \
         asm/generic.fs \          asm/generic.fs \
         asm/target.fs \          asm/target.fs \
         ec/00-readme \          ec/00-readme \
         ec/crossdoc.fd \  
         ec/mirror.fs \          ec/mirror.fs \
         ec/mirrors.fs \          ec/mirrors.fs \
         ec/shex.fs \          ec/shex.fs \
Line 211  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 209  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
 COMPAT  = compat/CVS compat/README compat/control.fs compat/anslocal.fs \  COMPAT  = compat/CVS compat/README compat/control.fs compat/anslocal.fs \
         compat/struct.fs compat/loops.fs          compat/struct.fs compat/loops.fs
   
   GFORTH_TEXI =  doc/gforth.texi doc/version.texi
   
 ALLSUBDIRS = engine  ALLSUBDIRS = engine
   
 ARCHS = arch/generic/machine.h \  ARCHS = arch/generic/machine.h \
Line 283  RCS_FILES =  ToDo model high-level Line 283  RCS_FILES =  ToDo model high-level
   
 GEN = gforth gforth-ditc kernel/version.fs version-stamp  GEN = gforth gforth-ditc kernel/version.fs version-stamp
   
 OBJECTS0 = engine/replace.a  
 OBJECTS = engine/engine.o engine/main.o  
 OBJECTS_DITC =  engine/engine-ditc.o engine/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 = 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
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
Line 299  DOCDIST = doc/gforth.info doc/gforth.inf Line 295  DOCDIST = doc/gforth.info doc/gforth.inf
 #stuff in a binonly distribution   #stuff in a binonly distribution 
 BINONLYDIST = config.status Makefile gforth gforth-ditc \  BINONLYDIST = config.status Makefile gforth gforth-ditc \
         $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\          $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
         arch/$(machine)/machine.h engine/config.h kernel.fi \          arch/$(machine)/machine.h engine/config.h engine/Makefile \
         stamp-h engine/version.h kernel/version.fs version-stamp \          stamp-h kernel/version.fs version-stamp \
         INSTALL.BINDIST          INSTALL.BINDIST
   
 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) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile configure  GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) doc/gforth.texi doc/gforth.dvi doc/gforth.ps Makefile engine/Makefile configure
   
 #standards.info recommends this:  #standards.info recommends this:
 .SUFFIXES:  .SUFFIXES:
Line 328  version: Makefile.in Line 324  version: Makefile.in
 # of the "/ and \" problem. Copying works because we use the  # of the "/ and \" problem. Copying works because we use the
 # shell und file utilities.  # shell und file utilities.
   
 engine/version.h:       version  
                 bash versions.bsh $(VERSION)  
   
 kernel/version.fs:      version  kernel/version.fs:      version
                 $(MAKE) gforth          $(MAKE) gforth
                 bash versions.bsh $(VERSION)          $(SHELL) versions.bsh $(VERSION)
   
 more:   engine $(FORTH_GEN) gforth  more:   engine $(FORTH_GEN) gforth
   
Line 355  mostlyclean: FORCE Line 348  mostlyclean: FORCE
                 doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \                  doc/gforth.dvi doc/gforth.fn doc/gforth.ky doc/gforth.log \
                 doc/gforth.pg \                  doc/gforth.pg \
                 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
                 engine/version.h  
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) *.o engine/*.o engine/*.a                  -$(RM) -rf $(GEN) *.o engine/*.o engine/*.a
   
 distclean:      clean  distclean:      clean
                 -$(RM) machine kernel.fi config.cache config.log \                  -$(RM) config.cache config.log \
                 config.status engine/config.h Makefile stamp-h                  config.status engine/config.h Makefile engine/Makefile stamp-h
   
 #realclean is useless, but dangerous, so it's commented out  #realclean is useless, but dangerous, so it's commented out
 #realclean:     distclean  #realclean:     distclean
Line 450  binonlydist: $(SOURCES) $(FORTH_GEN0) @K Line 442  binonlydist: $(SOURCES) $(FORTH_GEN0) @K
 #install does not depend on gforth.info, because that would require  #install does not depend on gforth.info, because that would require
 #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 $(FORTH_SRC) kernel.fi gforth.fi doc/gforth.1 prim gforth.TAGS installdirs  install:        gforth $(FORTH_SRC) $(kernel_fi) gforth.fi doc/gforth.1 prim gforth.TAGS installdirs
                 touch $(datadir)/gforth/site-forth/siteinit.fs                  touch $(datadir)/gforth/site-forth/siteinit.fs
                 -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)                  -$(RM) $(bindir)/gforth $(bindir)/gforth-$(VERSION)
                 $(INSTALL_PROGRAM) -s gforth $(bindir)                  $(INSTALL_PROGRAM) -s gforth $(bindir)
Line 460  install: gforth $(FORTH_SRC) kernel.fi g Line 452  install: gforth $(FORTH_SRC) kernel.fi g
                 for i in $(FORTH_SRC) prim; do \                  for i in $(FORTH_SRC) prim; do \
                         $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \                          $(INSTALL_DATA) $(srcdir)/$$i $(datadir)/gforth/$(VERSION); \
                 done                  done
                 $(INSTALL_DATA) kernel.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) $(kernel_fi) $(datadir)/gforth/$(VERSION)
                 $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names                  $(RM) gforth.fi; $(MAKE) gforth.fi #gforth.fi contains some path names
                 $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION)
                 sed 's:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)                  sed 's:^$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >TAGS; $(INSTALL_DATA) TAGS $(datadir)/gforth/$(VERSION)
Line 561  kernl64l.fi: $(KERNLS) Line 553  kernl64l.fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 # If we want a new kernel.fi we should use "kernel.fi:" this makes  gforth.fi:      $(kernel_fi) gforthmi gforth gforth-ditc $(GFORTH_FI_SRC)
 # a link or a copy from kernl....fi to kernel.fi                   GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs
 # works for dos-computers, too!!  
   
 kernel.fi:       @kernel_fi@  
                 @LINK_KERNL@  
   
 gforth.fi:      kernel.fi gforthmi gforth gforth-ditc $(GFORTH_FI_SRC)  
                 GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc -p .$(PATHSEP)$(srcdir) -i kernel.fi startup.fs" $(srcdir)/gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) startup.fs  
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
Line 598  kernel/prim.fs: prim.b prims2x.fs kernel Line 583  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 engine:         engine/prim_lab.i engine/prim.i engine/version.h FORCE  gforth:         FORCE
                 $(MAKE) -C engine engine  
   
 engine_ditc:    engine/prim_lab.i engine/prim.i engine/version.h FORCE  
                 $(MAKE) -C engine engine_ditc  
   
 gforth:         engine  
                 -$(CP) gforth gforth~                  -$(CP) gforth gforth~
                 $(GCC) $(LDFLAGS) $(OBJECTS) $(OBJECTS0) $(LDLIBS) -o $@                  cd engine; make gforth; cd ..
                   $(CP) engine/$@ $@
                 @GFORTH_EXE@                  @GFORTH_EXE@
   
 gforth-ditc:    engine_ditc  gforth-ditc:    FORCE
                 $(GCC) $(LDFLAGS) $(OBJECTS_DITC) $(OBJECTS0) $(LDLIBS) -o $@                  cd engine; make gforth-ditc; cd ..
                   $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
 # ------------- additional C primitives  # ------------- additional C primitives
Line 637  prim.TAGS:  prim.b prims2x.fs Line 618  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  doc/doc.fd:     doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs mini-oof.fs
                 $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs -e bye                  $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs startup.fs code.fs objects.fs oof.fs mini-oof.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
Line 655  checkdoc: doc/gforth.ds prim.b ds2texi.f Line 636  checkdoc: doc/gforth.ds prim.b ds2texi.f
   
 dvi:            doc/gforth.dvi  dvi:            doc/gforth.dvi
   
 doc/gforth.dvi doc/gforth.fns:  doc/gforth.texi  doc/gforth.dvi doc/gforth.fns:  $(GFORTH_TEXI)
                 cd doc; $(TEXI2DVI) gforth.texi                  cd doc; $(TEXI2DVI) gforth.texi
   
 doc/gforth.ps:  doc/gforth.dvi  doc/gforth.ps:  doc/gforth.dvi
Line 663  doc/gforth.ps: doc/gforth.dvi Line 644  doc/gforth.ps: doc/gforth.dvi
   
 info:           doc/gforth.info  info:           doc/gforth.info
   
 doc/gforth.info doc/gforth.info-*:      doc/gforth.texi  doc/gforth.info doc/gforth.info-*: $(GFORTH_TEXI)
                 -cd doc; $(MAKEINFO) gforth.texi                  -cd doc; $(MAKEINFO) gforth.texi
   
 html:           doc/gforth.texi  html:           $(GFORTH_TEXI)
                 -$(RM) html/*                  -$(RM) html/*
                 -mkdir html                  -mkdir html
                 cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi                  cd html; $(TEXI2HTML) -menu -split_node ../doc/gforth.texi
Line 675  doc:  doc/gforth.ps html Line 656  doc:  doc/gforth.ps html
   
 # For an explanation of the following Makefile rules, see node  # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.  # `Automatic Remaking' in GNU Autoconf documentation.
 $(srcdir)/configure:    configure.in   $(srcdir)/configure:    configure.in aclocal.m4
                 cd $(srcdir) && autoconf                  cd $(srcdir) && autoconf
   
   aclocal.m4:     acinclude.m4 configure.in
                   aclocal
   
 # autoheader might not change config.h.in, so touch a stamp file.  # autoheader might not change config.h.in, so touch a stamp file.
 config.h.in:    stamp-h.in  config.h.in:    stamp-h.in
 stamp-h.in:     configure.in  acconfig.h  stamp-h.in:     configure.in  acconfig.h
Line 688  engine/config.h: stamp-h Line 672  engine/config.h: stamp-h
 stamp-h:        config.h.in config.status  stamp-h:        config.h.in config.status
                 CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status                  CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status
                 echo > stamp-h                  echo > stamp-h
   
 Makefile:       Makefile.in config.status  Makefile:       Makefile.in config.status
                 CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status                  CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
   
   engine/Makefile: engine/Makefile.in config.status
                   CONFIG_FILES="$@ engine/$@" CONFIG_HEADERS=engine/config.h ./config.status
             
 config.status:  configure  config.status:  configure
                 ./config.status --recheck                  ./config.status --recheck

Removed from v.1.109  
changed lines
  Added in v.1.113


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