Diff for /gforth/Makefile.in between versions 1.400 and 1.416

version 1.400, 2008/05/07 08:57:10 version 1.416, 2008/08/09 08:24:06
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 129  datarootdir = @datarootdir@ Line 129  datarootdir = @datarootdir@
 datadir = @datadir@  datadir = @datadir@
 #read-only architecture-dependent non-ascii files  #read-only architecture-dependent non-ascii files
 libdir = @libdir@  libdir = @libdir@
   libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/
 includedir = @includedir@  includedir = @includedir@
 infodir = @infodir@  infodir = @infodir@
 htmldir = @htmldir@  htmldir = @htmldir@
Line 255  GFORTH_FI_SRC = \ Line 256  GFORTH_FI_SRC = \
         arch/mips/testasm.fs arch/mips/testdisasm.fs \          arch/mips/testasm.fs arch/mips/testdisasm.fs \
         arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs          arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs
   
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \  LIBCC_SRC = libffi.fs fflib.fs unix/socket.fs
   
   FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_SRC) \
         ans-report.fs ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         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 \
Line 275  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 278  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         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 \
         add.fs lib.fs oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \          add.fs lib.fs oldlib.fs sieve.fs \
         endtry-iferror.fs recover-endtry.fs          endtry-iferror.fs recover-endtry.fs
   
 COMPAT = compat/README \  COMPAT = compat/README \
Line 345  ARCHS = \ Line 348  ARCHS = \
         arch/sharc/types.h \          arch/sharc/types.h \
         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/asm-test.fs \          arch/r8c/mach.fs \
         arch/r8c/prim.fs \          arch/r8c/prim.fs
         arch/r8c/errors.fs \  
         arch/r8c/tt.fs \  
         arch/r8c/tasker.fs \  
         arch/r8c/lauflicht.fs \  
         arch/r8c/terminal.fs \  
         arch/r8c/mach.fs  
   
 #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 369  ARCHS_NO_DIST = \ Line 366  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/errors.fs \
           arch/r8c/lauflicht.fs \
           arch/r8c/tasker.fs \
           arch/r8c/terminal.fs \
           arch/r8c/tt.fs \
         arch/sharc/unistd.h          arch/sharc/unistd.h
   
 VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \  VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
Line 396  ENGINE_SOURCES = engine/Makefile.in engi Line 399  ENGINE_SOURCES = engine/Makefile.in engi
   
 SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \  SOURCES = $(CVSDIRS) $(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 \
         configure.in configure config.sub config.guess elisp-comp missing \          autogen.sh configure.in configure config.sub config.guess \
         stamp-h.in envos.fs.in \          elisp-comp missing stamp-h.in envos.fs.in \
         iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \          iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
         BUILD-FROM-SCRATCH model \          BUILD-FROM-SCRATCH model \
         COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \          COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \
Line 421  ENGINES = gforth$(EC)$(EXE) gforth-ditc$ Line 424  ENGINES = gforth$(EC)$(EXE) gforth-ditc$
   
 ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE)   ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) 
   
 GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc  GEN = $(ENGINES) $(ENGINES_FAST) gforth.elc
   
 # things that need a working forth system to be generated  # things that need a working forth system to be generated
 FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \  FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \
Line 607  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 610  install: gforth$(EC)$(EXE) $(FORTH_SRC)
                 done                  done
                 $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)                  $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION)
                 @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \                  @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \
                           $(INSTALL_DATA) gforth.el $(DESTDIR)$(emacssitelispdir); \
                         $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \                          $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \
                 else \                  else \
                         echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \                          echo '>>>>>Please install gforth.{el,elc} in your .../emacs/site-lisp directory'; \
                 fi                  fi
                 -$(RM) gforth.fi                  -$(RM) gforth.fi
                 GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)                  GFORTHD="./gforth-ditc -p $(DESTDIR)$(libdir)/gforth/site-forth$(PATHSEP)$(DESTDIR)$(siteforthdir)$(PATHSEP)$(DESTDIR)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" includedir=$(includedir) bindir=$(bindir) libccdir=$(libccdir) GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
                 $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) gforth.fi install.TAGS                  $(RM) gforth.fi install.TAGS
                 $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)                  $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)
                   for i in $(LIBCC_SRC); do @GNU_LIBTOOL@ --silent --mode=install $(INSTALL) lib/gforth/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; done
                 $(POST_INSTALL)                  $(POST_INSTALL)
                 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info                  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info
                 #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info                  #$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info
Line 625  install-strip: install Line 630  install-strip: install
   
 installdirs:    mkinstalldirs  installdirs:    mkinstalldirs
                 $(NORMAL_INSTALL)                  $(NORMAL_INSTALL)
                 for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION); 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 \                  for i in $(CVSDIRS); do \
Line 640  uninstall: FORCE Line 645  uninstall: FORCE
                 -$(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"
   
 check:          gforths gforth.fi  check-libcc-named: $(LIBCC_SRC)
                   $(RMTREE) lib/gforth/$(VERSION)/libcc-named/
                   $(srcdir)/mkinstalldirs lib/gforth/$(VERSION)/libcc-named/
                   for i in $(LIBCC_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path :noname 2drop s\" $(libccdir)\" ; is replace-rpath" $$i -e bye; done
   
   check:          gforths gforth.fi 
                 $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
                   $(MAKE) check-libcc-named
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
                 ./gforth-fast --diag -e bye                  ./gforth-fast --diag -e bye
   
Line 755  kernl64l$(EC).fi: $(KERNLS) Line 766  kernl64l$(EC).fi: $(KERNLS)
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs  gforth.fi:      $(kernel_fi) gforthmi gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs
                 GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)                  GFORTHD="./gforth-ditc -p .$(PATHSEP)$(srcdir)" GFORTH="./gforth-ditc --die-on-signal -p .$(PATHSEP)$(srcdir) -i $(kernel_fi) $(STARTUP)" includedir=`pwd`/include bindir=`pwd` libccdir=`pwd`/lib/gforth/$(VERSION)/libcc-named/ ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
Line 796  MAKELINE-noll-reg = OPT=-noll-reg OPTDEF Line 807  MAKELINE-noll-reg = OPT=-noll-reg OPTDEF
 MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=  MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=
 MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o  MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o
   
 gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h $(kernel_fi)  gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@
         if test -z "$(OPT)"; then \          if test -z "$(OPT)"; then \
                 for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \                  for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \
         else \          else \
Line 897  kernel.tags: Line 908  kernel.tags:
   
 #elc files  #elc files
 gforth.elc:     gforth.el  gforth.elc:     gforth.el
                 emacs -batch -f batch-byte-compile $<                  -emacs -batch -f batch-byte-compile $<
   
 #Documentation  #Documentation
   
Line 985  engine/config.h: stamp-h Line 996  engine/config.h: stamp-h
 stamp-h: engine/config.h.in config.status stamp-h.in  stamp-h: engine/config.h.in config.status stamp-h.in
         ./config.status          ./config.status
   
 Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in  Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in
         ./config.status          ./config.status
   
 config.status: configure  config.status: configure

Removed from v.1.400  
changed lines
  Added in v.1.416


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