Diff for /gforth/Makefile.in between versions 1.121 and 1.127

version 1.121, 1998/10/14 22:36:41 version 1.127, 1998/12/08 22:02:33
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995-1997 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 37  DOSVERSION=`echo $VERSION|sed 's/\.//g'` Line 37  DOSVERSION=`echo $VERSION|sed 's/\.//g'`
   
 machine=@machine@  machine=@machine@
 kernel_fi=@kernel_fi@  kernel_fi=@kernel_fi@
   EXE=@EXE@
   
 # 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
Line 105  man1ext= .1 Line 106  man1ext= .1
 #older emacses have their site-lisp in $(libdir)/emacs/  #older emacses have their site-lisp in $(libdir)/emacs/
 emacssitelispdir=@lispdir@  emacssitelispdir=@lispdir@
   
 INCLUDES = engine/CVS engine/forth.h engine/threaded.h engine/io.h  CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \
           compat/CVS \
           arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \
           arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \
           arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \
           arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \
           arch/shboom/CVS \
   
   INCLUDES = engine/forth.h engine/threaded.h engine/io.h
   
 KERN_SRC = \  KERN_SRC = \
         kernel/CVS \  
         kernel/aliases0.fs \          kernel/aliases0.fs \
         kernel/aliases.fs \          kernel/aliases.fs \
         kernel/args.fs \          kernel/args.fs \
Line 140  KERN_SRC = \ Line 148  KERN_SRC = \
         kernel/getdoers.fs          kernel/getdoers.fs
   
 EC_SRC = \  EC_SRC = \
         asm/CVS \  
         asm/README \          asm/README \
         asm/bitmask.fs \          asm/bitmask.fs \
         asm/numref.fs \          asm/numref.fs \
         asm/basic.fs \          asm/basic.fs \
         asm/generic.fs \          asm/generic.fs \
         asm/target.fs \          asm/target.fs \
         ec/CVS \  
         ec/README \          ec/README \
         ec/mirror.fs \          ec/mirror.fs \
         ec/mirrors.fs \          ec/mirrors.fs \
Line 195  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 201  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         ans-report.fs ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         code.fs colorize.fs comp-i.fs \          code.fs colorize.fs comp-i.fs \
         doskey.fs ds2texi.fs \          doskey.fs ds2texi.fs \
         envos.fs envos.dos envos.os2 etags.fs filedump.fs \          envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
         glosgen.fs gray.fs \          glosgen.fs gray.fs \
         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 \
Line 204  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 210  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         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 \
         test/other.fs test/checkans.fs test/CVS \          test/other.fs test/checkans.fs \
         bubble.fs siev.fs matrix.fs fib.fs \          bubble.fs siev.fs matrix.fs fib.fs \
         oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs          oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs
   
 COMPAT  = compat/CVS compat/README compat/control.fs compat/anslocal.fs \  COMPAT  = 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  GFORTH_TEXI =  doc/gforth.texi doc/version.texi
Line 216  GFORTH_TEXI =  doc/gforth.texi doc/versi Line 222  GFORTH_TEXI =  doc/gforth.texi doc/versi
 ALLSUBDIRS = engine  ALLSUBDIRS = engine
   
 ARCHS = \  ARCHS = \
         arch/CVS \  
         arch/generic/CVS \  
         arch/generic/machine.h \          arch/generic/machine.h \
         arch/m68k/CVS \  
         arch/m68k/machine.h \          arch/m68k/machine.h \
         arch/mips/CVS \  
         arch/mips/machine.h \          arch/mips/machine.h \
         arch/386/CVS \  
         arch/386/machine.h \          arch/386/machine.h \
         arch/hppa/CVS \  
         arch/hppa/machine.h \          arch/hppa/machine.h \
         arch/hppa/cache.c \          arch/hppa/cache.c \
         arch/sparc/CVS \  
         arch/sparc/machine.h \          arch/sparc/machine.h \
         arch/power/CVS \  
         arch/power/machine.h \          arch/power/machine.h \
         arch/power/_sync_cache_range.c \          arch/power/_sync_cache_range.c \
         arch/alpha/CVS \  
         arch/alpha/machine.h \          arch/alpha/machine.h \
         arch/4stack/CVS \  
         arch/4stack/README \          arch/4stack/README \
         arch/4stack/asm.fs \          arch/4stack/asm.fs \
         arch/4stack/mach.fs \          arch/4stack/mach.fs \
         arch/4stack/prim.fs \          arch/4stack/prim.fs \
         arch/4stack/mach.sh \          arch/4stack/mach.sh \
         arch/4stack/relocate.fs \          arch/4stack/relocate.fs \
         arch/misc/CVS \  
         arch/misc/README \          arch/misc/README \
         arch/misc/asm.fs \          arch/misc/asm.fs \
         arch/misc/mach.fs \          arch/misc/mach.fs \
Line 250  ARCHS = \ Line 245  ARCHS = \
         arch/misc/sim.fs \          arch/misc/sim.fs \
         arch/misc/sokoban.fs \          arch/misc/sokoban.fs \
         arch/misc/tt.fs \          arch/misc/tt.fs \
         arch/6502/CVS \  
         arch/6502/asm.fs \          arch/6502/asm.fs \
         arch/6502/prim.fs \          arch/6502/prim.fs \
         arch/6502/mach.fs \          arch/6502/mach.fs \
         arch/6502/zero.fs \          arch/6502/zero.fs \
         arch/6502/softuart.fs \          arch/6502/softuart.fs \
         arch/6502/cold.fs \          arch/6502/cold.fs \
         arch/8086/CVS \  
         arch/8086/asm.fs \          arch/8086/asm.fs \
         arch/8086/mach.fs \          arch/8086/mach.fs \
         arch/8086/mach.sh \          arch/8086/mach.sh \
         arch/8086/prim.fs \          arch/8086/prim.fs \
         arch/avr/CVS \  
         arch/avr/asm.fs \          arch/avr/asm.fs \
         arch/c165/CVS \  
         arch/c165/asm.fs \          arch/c165/asm.fs \
         arch/c165/mach.fs \          arch/c165/mach.fs \
         arch/c165/prim.fs \          arch/c165/prim.fs \
         arch/h8/CVS \  
         arch/h8/asm.fs \          arch/h8/asm.fs \
         arch/shboom/CVS \  
         arch/shboom/asm.fs \          arch/shboom/asm.fs \
         arch/shboom/compiler.fs \          arch/shboom/compiler.fs \
         arch/shboom/dis.fs \          arch/shboom/dis.fs \
Line 280  ARCHS = \ Line 269  ARCHS = \
         arch/shboom/sh.p \          arch/shboom/sh.p \
         arch/shboom/doers.fs          arch/shboom/doers.fs
   
 SOURCES = CVS engine/CVS compat Makefile.in engine/Makefile.in gforthmi \  SOURCES = $(CVSDIRS) compat Makefile.in engine/Makefile.in gforthmi \
         configure.in configure config.sub config.guess elisp-comp missing \          configure.in configure config.sub config.guess elisp-comp missing \
         acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \          acconfig.h acinclude.m4 engine/config.h.in stamp-h.in \
         install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \          install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS model \
         COPYING AUTHORS ChangeLog Benchres aclocal.m4 \          COPYING AUTHORS ChangeLog Benchres aclocal.m4 \
         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 \
         doc/CVS 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) \          $(ARCHS) \
         engine/32bit.h \          engine/32bit.h \
Line 305  SOURCES = CVS engine/CVS compat Makefile Line 294  SOURCES = CVS engine/CVS compat Makefile
   
 RCS_FILES =  ToDo model high-level  RCS_FILES =  ToDo model high-level
   
 GEN = gforth gforth-ditc kernel/version.fs version-stamp  GEN = gforth$(EXE) gforth-ditc$(EXE) kernel/version.fs version-stamp
   
 # 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 314  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gfor Line 303  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.ps  DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.txt doc/gforth.ps
   
 #stuff in a binonly distribution   #stuff in a binonly distribution 
 BINONLYDIST = config.status Makefile gforth gforth-ditc \  BINONLYDIST = config.status Makefile gforth$(EXE) gforth-ditc$(EXE) \
         $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\          $(OBJECTS0) $(OBJECTS) $(OBJECTS_DITC)\
         arch/$(machine)/machine.h engine/config.h engine/Makefile \          arch/$(machine)/machine.h engine/config.h engine/Makefile \
         stamp-h kernel/version.fs version-stamp \          stamp-h kernel/version.fs version-stamp \
Line 349  version: Makefile.in Line 338  version: Makefile.in
 # shell und file utilities.  # shell und file utilities.
   
 kernel/version.fs:      version  kernel/version.fs:      version
         $(MAKE) gforth          $(MAKE) gforth$(EXE)
         $(SHELL) versions.bsh $(VERSION)          $(SHELL) versions.bsh $(VERSION)
   
 more:   engine $(FORTH_GEN) gforth  more:   engine $(FORTH_GEN) gforth$(EXE)
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 376  mostlyclean: FORCE Line 365  mostlyclean: FORCE
                 gforth-$(VERSION).tar.gz                  gforth-$(VERSION).tar.gz
   
 clean:          mostlyclean  clean:          mostlyclean
                 -$(RM) -rf $(GEN) engine/gforth engine/gforth-ditc \                  -$(RM) -rf $(GEN) engine/gforth$(EXE) engine/gforth-ditc$(EXE) \
                 *.o engine/*.o arch/*/*.o version                  *.o engine/*.o arch/*/*.o version
   
 distclean:      clean  distclean:      clean
Line 470  binonlydist: $(SOURCES) $(FORTH_GEN0) @K Line 459  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$(EXE) $(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$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
                 $(INSTALL_PROGRAM) -s gforth $(bindir)                  $(INSTALL_PROGRAM) -s gforth$(EXE) $(bindir)
                 ln $(bindir)/gforth $(bindir)/gforth-$(VERSION)                  ln $(bindir)/gforth$(EXE) $(bindir)/gforth-$(VERSION)$(EXE)
                 -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)                  -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(man1dir)
                 -for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done                  -for i in $(srcdir)/gforth.info*; do $(INSTALL_DATA) $$i $(infodir); done
                 for i in $(FORTH_SRC) prim; do \                  for i in $(FORTH_SRC) prim; do \
Line 503  uninstall: FORCE Line 492  uninstall: FORCE
                 -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)                  -$(RM) -rf $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(bindir)/gforth-$(VERSION)
                 @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"                  @echo -e "Type\n$(RM) -rf $(bindir)/gforth $(man1dir)/gforth.1 $(infodir)/gforth.info* $(datadir)/gforth $(libdir)/gforth\nto remove Gforth completely"
   
 check test:     gforth gforth.fi  check test:     gforth$(EXE) gforth.fi
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye                  $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs -e bye
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 $(FORTH) code.fs test/checkans.fs -e bye                  $(FORTH) code.fs test/checkans.fs -e bye
                 @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 gforth.fi  bench:          gforth$(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) siev.fs -e "main bye"
                 time $(FORTH) bubble.fs -e "main bye"                  time $(FORTH) bubble.fs -e "main bye"
Line 545  kernl64l.fi-: $(KERN_SRC) kernel/version Line 534  kernl64l.fi-: $(KERN_SRC) kernel/version
 kernl64b.fi-:   $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)  kernl64b.fi-:   $(KERN_SRC) kernel/version.fs mach64b.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" mach64b.fs"' kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" mach64b.fs"' kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
   
 kernl-%.fi:     arch/%/mach.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) \  kernl-%.fi:     arch/%/mach.fs \
                 arch/%/prim.fs arch/%/asm.fs                  $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
                 $(FORTHK) -e 's" $<"' kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHK) -e 's" $<"' kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
                 if [ -f `echo $< | sed s/fs/sh/` ]; \                  if [ -f `echo $< | sed s/fs/sh/` ]; \
                 then sh `echo $< | sed s/fs/sh/` $@; \                  then sh `echo $< | sed s/fs/sh/` $@; \
                 else $(CP) $@- $@; \                  else $(CP) $@- $@; \
                 fi                  fi
   
   arch/%/mach.fs: arch/%/prim.fs
   
   arch/%/prim.fs: arch/%/asm.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
Line 581  kernl64l.fi: $(KERNLS) Line 574  kernl64l.fi: $(KERNLS)
 #               -$(CP) $@ $@~  #               -$(CP) $@ $@~
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth gforth-ditc $(GFORTH_FI_SRC)  gforth.fi:      $(kernel_fi) gforthmi gforth$(EXE) gforth-ditc$(EXE) $(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                  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 611  kernel/prim.fs: prim.b prims2x.fs kernel Line 604  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 gforth:         FORCE  gforth$(EXE):           FORCE
                 -$(CP) gforth gforth~                  -$(CP) gforth$(EXE) gforth~
                 $(MAKE) -C engine gforth                  cd engine && $(MAKE) gforth$(EXE)
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTH_EXE@                  @GFORTH_EXE@
   
 gforth-ditc:    FORCE  gforth-ditc$(EXE):      FORCE
                 $(MAKE) -C engine gforth-ditc                  cd engine && $(MAKE) gforth-ditc$(EXE)
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
Line 683  html:  $(GFORTH_TEXI) Line 676  html:  $(GFORTH_TEXI)
 doc/gforth.txt: $(GFORTH_TEXI)  doc/gforth.txt: $(GFORTH_TEXI)
                 -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt                  -cd doc; $(MAKEINFO) --no-headers --no-split gforth.texi >gforth.txt
   
 doc:            doc/gforth.ps html  doc:            doc/gforth.ps html doc/gforth.txt
   
 # 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.
Line 694  aclocal.m4: acinclude.m4 configure.in Line 687  aclocal.m4: acinclude.m4 configure.in
                 aclocal                  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  engine/config.h.in:     stamp-h.in
 stamp-h.in:     configure.in  acconfig.h  stamp-h.in:     configure.in  acconfig.h
                 cd $(srcdir) && autoheader                  cd $(srcdir) && autoheader
                 echo timestamp > $(srcdir)/stamp-h.in                  echo timestamp > $(srcdir)/stamp-h.in
   
 engine/config.h:        stamp-h  engine/config.h:        stamp-h
 stamp-h:        config.h.in config.status  stamp-h:        engine/config.h.in config.status
                 CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status                  CONFIG_FILES=$@ CONFIG_HEADERS=engine/config.h ./config.status
                 echo timestamp > stamp-h                  echo timestamp > stamp-h
   
 Makefile:       Makefile.in config.status  Makefile:       Makefile.in engine/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.121  
changed lines
  Added in v.1.127


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