Diff for /gforth/Makefile.in between versions 1.431 and 1.448

version 1.431, 2008/10/25 17:18:42 version 1.448, 2009/12/31 15:32:35
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 82  BUILDFORTH = $(ENGINE) --die-on-signal - Line 82  BUILDFORTH = $(ENGINE) --die-on-signal -
 # the forth system plus flags we use to build  # the forth system plus flags we use to build
 FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)'  FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)'
 # the Forth system for running prims2x.fs  # the Forth system for running prims2x.fs
 FORTHP = $(FORTH)  #FORTHP = $(FORTH)
 ENGINE_FAST = ./gforth-fast  ENGINE_FAST = ./gforth-fast
 FORTH_FAST      = $(ENGINE_FAST) $(FORTH_ARGS)  FORTH_FAST      = $(ENGINE_FAST) $(FORTH_ARGS)
 FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)  FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi)
Line 143  siteforthdir=$(datadir)/gforth/site-fort Line 143  siteforthdir=$(datadir)/gforth/site-fort
 PROFOBJS = @PROFOBJS@  PROFOBJS = @PROFOBJS@
 PROFEXES = @PROFEXES@  PROFEXES = @PROFEXES@
   
 CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \  INSTALLDIRS = kernel doc asm ec test \
         compat/CVS unix/CVS \          compat unix \
         arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \          arch arch/generic arch/m68k arch/mips \
         arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \          arch/386 arch/hppa arch/sparc arch/power \
         arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \          arch/alpha arch/4stack arch/misc arch/6502 \
         arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \          arch/8086 arch/avr arch/c165 arch/h8 \
         arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \          arch/shboom arch/sharc arch/ia64 arch/amd64 \
         arch/arm/CVS arch/r8c/CVS          arch/arm arch/r8c
   
 INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h  INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h
   
Line 235  GFORTH_FI_SRC = \ Line 235  GFORTH_FI_SRC = \
         locals.fs \          locals.fs \
         look.fs \          look.fs \
         mkdir.fs \          mkdir.fs \
           prelude.fs \
         quotes.fs \          quotes.fs \
         search.fs \          search.fs \
         see.fs \          see.fs \
Line 269  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 270  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         colorize.fs comp-i.fs complex.fs \          colorize.fs comp-i.fs complex.fs \
         depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \          depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \
         envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.fs \          envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.fs \
         fsl-util.4th glosgen.fs gray.fs httpd.fs proxy.fs \          fsl-util.4th glosgen.fs gray.fs httpd.fs install-tags.fs \
         make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs \          make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs \
         other.fs prims2x.fs prims2x0.6.2.fs random.fs \          other.fs prims2x.fs prims2x0.6.2.fs proxy.fs random.fs \
         regexp.fs sokoban.fs string.fs table.fs tags.fs \          regexp.fs sokoban.fs string.fs table.fs tags.fs \
         tt.fs \          tt.fs \
         unbuffer.fs wordsets.fs xwords.fs \          unbuffer.fs wordsets.fs xwords.fs \
Line 281  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 282  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         test/other.fs test/signals.fs test/checkans.fs \          test/other.fs test/signals.fs test/checkans.fs \
         test/primtest.fs test/coreext.fs test/deferred.fs \          test/primtest.fs test/coreext.fs test/deferred.fs \
         test/coremore.fs test/gforth-nofast.fs test/libcc.fs \          test/coremore.fs test/gforth-nofast.fs test/libcc.fs \
           test/macros.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 \
         moofglos.fs fixpath.fs \          moofglos.fs fixpath.fs \
Line 295  COMPAT = compat/README \ Line 297  COMPAT = compat/README \
         compat/exception.fs \          compat/exception.fs \
         compat/execute-parsing.fs \          compat/execute-parsing.fs \
         compat/loops.fs \          compat/loops.fs \
           compat/macros.fs \
         compat/required.fs \          compat/required.fs \
         compat/strcomp.fs \          compat/strcomp.fs \
         compat/struct.fs \          compat/struct.fs \
Line 355  ARCHS = \ Line 358  ARCHS = \
         arch/sharc/g21k-3.3.4-bp1.diff \          arch/sharc/g21k-3.3.4-bp1.diff \
         arch/r8c/asm.fs \          arch/r8c/asm.fs \
         arch/r8c/mach.fs \          arch/r8c/mach.fs \
         arch/r8c/prim.fs          arch/r8c/errors.fs \
           arch/r8c/prim.fs \
           arch/r8c/asm-test.fs \
           arch/r8c/errors.fs \
           arch/r8c/lauflicht.fs \
           arch/r8c/tasker.fs \
           arch/r8c/terminal.fs \
           arch/sharc/unistd.h
   
 #not included in distribution until distribution terms are included:  #not included in distribution until distribution terms are included:
 ARCHS_NO_DIST = \  ARCHS_NO_DIST = \
Line 372  ARCHS_NO_DIST = \ Line 382  ARCHS_NO_DIST = \
         arch/c165/mach.fs \          arch/c165/mach.fs \
         arch/c165/prim.fs \          arch/c165/prim.fs \
         arch/h8/asm.fs \          arch/h8/asm.fs \
         arch/r8c/asm-test.fs \          arch/r8c/tt.fs
         arch/r8c/errors.fs \  
         arch/r8c/lauflicht.fs \  
         arch/r8c/tasker.fs \  
         arch/r8c/terminal.fs \  
         arch/r8c/tt.fs \  
         arch/sharc/unistd.h  
   
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \  VMGEN_EX = vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
         vmgen-ex/engine.c vmgen-ex/fib.mini \          vmgen-ex/engine.c vmgen-ex/fib.mini \
         vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \          vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \
         vmgen-ex/mini.l vmgen-ex/mini.y vmgen-ex/peephole-blacklist \          vmgen-ex/mini.l vmgen-ex/mini.y vmgen-ex/peephole-blacklist \
Line 403  ENGINE_SOURCES = engine/Makefile.in engi Line 407  ENGINE_SOURCES = engine/Makefile.in engi
         engine/fnmatch.h engine/fnmatch.c \          engine/fnmatch.h engine/fnmatch.c \
         engine/makefile.dos engine/makefile.os2          engine/makefile.dos engine/makefile.os2
   
 SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \  SOURCES = $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
         gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \          gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
         autogen.sh configure.in configure config.sub config.guess \          autogen.sh configure.in configure config.sub config.guess \
         elisp-comp missing stamp-h.in envos.fs.in \          elisp-comp missing stamp-h.in envos.fs.in \
Line 478  all: kernel/version.fs more check Line 482  all: kernel/version.fs more check
 # use this dependency for phony targets just as mostlyclean,...  # use this dependency for phony targets just as mostlyclean,...
 FORCE: ;  FORCE: ;
   
   #targets of failed commands should be deleted:
   .DELETE_ON_ERROR:
   
 #this rule avoids remaking everything after minor changes in Makefile.in  #this rule avoids remaking everything after minor changes in Makefile.in
 version:        Makefile.in configure.in  version:        Makefile.in configure.in
                 if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi                  if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi
Line 490  version: Makefile.in configure.in Line 497  version: Makefile.in configure.in
 kernel/version.fs:      version  kernel/version.fs:      version
         echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   $(ENGINES) $(FORTH_GEN) $(GEN)  more:   $(ENGINES) $(FORTH_GEN) $(GEN) @build_libcc_named@
         test -n "$(LIBTOOL)" && $(MAKE) build-libcc-named  
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 592  hpux-workaround: Line 598  hpux-workaround:
 install:        gforth$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs  install:        gforth$(EC)$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs
                 $(NORMAL_INSTALL)                  $(NORMAL_INSTALL)
                 touch $(DESTDIR)$(siteforthdir)/siteinit.fs                  touch $(DESTDIR)$(siteforthdir)/siteinit.fs
                 -$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi #$(DESTDIR)$(bindir)/vmgen                  -$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen
                 -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)                  -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE)
                 -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE)                  -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE)
                 $(INSTALL_PROGRAM) gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE)                  $(INSTALL_PROGRAM) gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE)
Line 640  installdirs: mkinstalldirs Line 646  installdirs: mkinstalldirs
                 for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \                  for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \
                         $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \                          $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
                 done                  done
                 for i in $(CVSDIRS); do \                  #
                         $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/`dirname $$i`; \                  for i in $(INSTALLDIRS); do \
                           $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \
                 done                  done
                 $(RM) -rf $(DESTDIR)$(datadir)/gforth/$(VERSION)/engine  
   
 #deinstall all files specific to this version of gforth  #deinstall all files specific to this version of gforth
 #to uninstall version foo, type `make uninstall VERSION=foo'  #to uninstall version foo, type `make uninstall VERSION=foo'
 uninstall:      FORCE  uninstall:      FORCE
                 $(NORMAL_UNINSTALL)                  $(NORMAL_UNINSTALL)
                 -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION)                  -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)$(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION)
                 @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth"                  @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth"
   
 build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE  build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE
Line 670  checkone test: gforth.fi engine/prim-s.i Line 676  checkone test: gforth.fi engine/prim-s.i
                 $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out                  $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/deferred.fs test/coreext.fs test/search.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/coretest.out
                 $(FORTH) test/other.fs -e bye                  $(FORTH) test/other.fs -e bye
                 $(FORTHS) test/signals.fs -e bye                  $(FORTHS) test/signals.fs -e bye
                 $(FORTHS) test/coremore.fs test/gforth.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out                  $(FORTHS) test/coremore.fs test/gforth.fs test/macros.fs -e bye 2>&1 | tr -d '\015' | diff -c - $(srcdir)/test/gforth.out
                 $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out                  $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out
                 $(FORTH) prims2x.fs -e \                  $(FORTH) prims2x.fs -e \
                   "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \                    "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \
Line 880  TAGS:  gforth.TAGS Line 886  TAGS:  gforth.TAGS
 tags:           gforth.tags  tags:           gforth.tags
                 $(CP) gforth.tags $@                  $(CP) gforth.tags $@
   
 install.TAGS:   TAGS  install.TAGS:   TAGS install-tags.fs
                 sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >install.TAGS                  sed 's;^\$(srcdir)/;;' TAGS|./gforth -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS
   
 gforth.TAGS:    @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS  gforth.TAGS:    @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
                 $(FORTHK) etags.fs except.fs startup.fs -e bye                  $(FORTHK) etags.fs except.fs startup.fs -e bye
Line 907  prim.tags:  prim.b prims2x.fs Line 913  prim.tags:  prim.b prims2x.fs
                 $(RM) $@-                  $(RM) $@-
   
 kernel.TAGS:  kernel.TAGS:
                 rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@                  $(RM) kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
   
 kernel.tags:  kernel.tags:
                 rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@                  $(RM) kernl16l$(EC).fi-; $(MAKE) @kernel_fi@
   
 #elc files  #elc files
 gforth.elc:     gforth.el  gforth.elc:     gforth.el
                 -$(EMACS) -batch -f batch-byte-compile $(srcdir)/gforth.el                  -$(EMACS) -batch -f batch-byte-compile gforth.el
   
 #Documentation  #Documentation
   
Line 1009  config.status: configure Line 1015  config.status: configure
         ./config.status --recheck          ./config.status --recheck
   
 #create files for DOS, because DOS cannot do it itself  #create files for DOS, because DOS cannot do it itself
 makefile.dos engine/makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in  makefile.dos: mkdosmf.sed Makefile.in
         sed -f mkdosmf.sed <Makefile.in >makefile.dos          sed -f mkdosmf.sed <Makefile.in >makefile.dos
   
   engine/makefile.dos: mkdosmf.sed engine/Makefile.in
         sed -f mkdosmf.sed <engine/Makefile.in >engine/makefile.dos          sed -f mkdosmf.sed <engine/Makefile.in >engine/makefile.dos
   
 makefile.os2 engine/makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in  makefile.os2: mkos2mf.sed Makefile.in
         sed -f mkos2mf.sed <Makefile.in >makefile.os2          sed -f mkos2mf.sed <Makefile.in >makefile.os2
           echo '%.o:      %.c' >>makefile.os2
           echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
   
   engine/makefile.os2: mkos2mf.sed engine/Makefile.in
         sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2          sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2
         echo '%.o:      %.c' >>makefile.os2          echo '%.o:      %.c' >>engine/makefile.os2
         echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2          echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2
         echo '%.o:      %.c' >>engine/makefile.os2  
         echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2  

Removed from v.1.431  
changed lines
  Added in v.1.448


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