Diff for /gforth/Makefile.in between versions 1.123 and 1.130

version 1.123, 1998/10/18 23:16:50 version 1.130, 1998/12/13 23:29:58
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 31 Line 31
 # ------------- gforth version  # ------------- gforth version
   
 VERSION = @VERSION@  VERSION = @VERSION@
 DOSVERSION=`echo $VERSION|sed 's/\.//g'`  DOSVERSION=`echo $(VERSION)|sed 's/\.//g'`
   
 # ------------- System specific variables         # ------------- System specific variables       
   
Line 54  SHELL = /bin/sh Line 54  SHELL = /bin/sh
 RM      = rm  RM      = rm
 RMTREE  = rm -rf  RMTREE  = rm -rf
 CP      = cp  CP      = cp
   MV      = mv
 TAR     = tar cf -  TAR     = tar cf -
 INSTALL = @INSTALL@  INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@  INSTALL_PROGRAM = @INSTALL_PROGRAM@
Line 106  man1ext= .1 Line 107  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 141  KERN_SRC = \ Line 149  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 196  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 202  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 205  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 211  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 217  GFORTH_TEXI =  doc/gforth.texi doc/versi Line 223  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 251  ARCHS = \ Line 246  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 281  ARCHS = \ Line 270  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/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \          engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \
         engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \          engine/ecvt.c engine/memcmp.c engine/strtol.c engine/strtoul.c \
         engine/ansidecl.h engine/memmove.c \          engine/ansidecl.h engine/memmove.c \
         engine/pow10.c engine/atanh.c engine/cleanalign.c \          engine/pow10.c engine/atanh.c engine/cleanalign.c \
         engine/strerror.c engine/strsignal.c engine/strsig.c engine/dblsub.c \          engine/strerror.c engine/strsignal.c engine/dblsub.c \
         INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \          INSTALL.DOS makefile.dos engine/makefile.dos mkdosmf.sed config.bat \
         dosconf.h gforthmi.bat mkinstalldirs \          dosconf.h gforthmi.bat mkinstalldirs \
         versions.bsh \          versions.bsh \
Line 315  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$(EXE) gforth-ditc$(EXE) \  BINONLYDIST = config.status Makefile gforth$(EXE) gforth-ditc$(EXE) \
Line 351  version: Makefile.in Line 339  version: Makefile.in
   
 kernel/version.fs:      version  kernel/version.fs:      version
         $(MAKE) gforth$(EXE)          $(MAKE) gforth$(EXE)
         $(SHELL) versions.bsh $(VERSION)          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   engine $(FORTH_GEN) gforth$(EXE)  more:   engine $(FORTH_GEN) gforth$(EXE)
   
Line 410  dosdist: $(SOURCES) $(FORTH_GEN0) @KERNE Line 398  dosdist: $(SOURCES) $(FORTH_GEN0) @KERNE
                 mkdir gforth.$(DOSVERSION)                  mkdir gforth.$(DOSVERSION)
                 $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \                  $(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \
                         (cd gforth.$(DOSVERSION); tar xf -)                          (cd gforth.$(DOSVERSION); tar xf -)
                   $(MV) gforth.$(DOSVERSION)/engine/strsignal.c gforth.$(DOSVERSION)/engine/strsig.c
                   for i in 1 2 3 4 5 6 7 8; do \
                           $(MV) gforth.$(DOSVERSION)/doc/gforth.info-$$i gforth.$(DOSVERSION)/doc/gforth.i$$i; \
                   done
                 zip -r9 gf$(DOSVERSION)dos.zip gforth.$(DOSVERSION)/*                  zip -r9 gf$(DOSVERSION)dos.zip gforth.$(DOSVERSION)/*
                 -$(RMTREE) gforth.$(DOSVERSION)                  -$(RMTREE) gforth.$(DOSVERSION)
   
Line 507  uninstall: FORCE Line 499  uninstall: FORCE
 check test:     gforth$(EXE) 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
                   @echo "Expect 'Missing: EKEY EKEY>CHAR EKEY? EMIT?'"
                   @echo "Expect 'Missing: EDITOR FORGET'"
                 $(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
Line 616  kernel/prim.fs: prim.b prims2x.fs kernel Line 610  kernel/prim.fs: prim.b prims2x.fs kernel
                 $(CP) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
 gforth$(EXE):           FORCE  gforth$(EXE):           engines
                 -$(CP) gforth$(EXE) gforth~                  -$(CP) gforth$(EXE) gforth~
                 cd engine && $(MAKE) gforth$(EXE)  
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTH_EXE@                  @GFORTH_EXE@
   
 gforth-ditc$(EXE):      FORCE  gforth-ditc$(EXE):      engines
                 cd engine && $(MAKE) gforth-ditc$(EXE)  
                 $(CP) engine/$@ $@                  $(CP) engine/$@ $@
                 @GFORTHDITC_EXE@                  @GFORTHDITC_EXE@
   
   engines:        FORCE
                   cd engine && $(MAKE) gforth$(EXE) gforth-ditc$(EXE)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
 %.c:            %.pri prim2cl.fs  %.c:            %.pri prim2cl.fs
Line 688  html:  $(GFORTH_TEXI) Line 683  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 699  aclocal.m4: acinclude.m4 configure.in Line 694  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
   

Removed from v.1.123  
changed lines
  Added in v.1.130


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