--- gforth/Makefile.in 2007/07/21 18:18:20 1.359 +++ gforth/Makefile.in 2007/12/31 18:40:23 1.372 @@ -1,12 +1,12 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 Free Software Foundation, Inc. #This file is part of Gforth. #Gforth is free software; you can redistribute it and/or #modify it under the terms of the GNU General Public License -#as published by the Free Software Foundation; either version 2 +#as published by the Free Software Foundation, either version 3 #of the License, or (at your option) any later version. #This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ #GNU General Public License for more details. #You should have received a copy of the GNU General Public License -#along with this program; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +#along with this program. If not, see http://www.gnu.org/licenses/. # To change the values of `make' variables: instead of editing Makefiles, # (1) if the variable is set in `config.status', edit `config.status' @@ -123,6 +122,7 @@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ bindir = @bindir@ #read-only architecture-independent files +datarootdir = @datarootdir@ datadir = @datadir@ #read-only architecture-dependent non-ascii files libdir = @libdir@ @@ -263,8 +263,9 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) regexp.fs sokoban.fs string.fs table.fs tags.fs \ tt.fs \ unbuffer.fs wordsets.fs xwords.fs \ - test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ - test/string.fs test/float.fs test/gforth.fs \ + test/tester.fs test/ttester.fs \ + test/coretest.fs test/postpone.fs test/dbltest.fs \ + test/string.fs test/float.fs test/search.fs test/gforth.fs \ test/other.fs test/signals.fs test/checkans.fs \ test/primtest.fs test/coreext.fs test/deferred.fs \ test/coremore.fs test/gforth-nofast.fs test/libcc.fs \ @@ -385,8 +386,8 @@ SOURCES = $(CVSDIRS) compat Makefile.in engine/config.h.in stamp-h.in envos.fs.in \ iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \ BUILD-FROM-SCRATCH model \ - COPYING COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ - doc/gforth.ds doc/texinfo.tex doc/gforth.1 doc/version.texi.in \ + COPYING COPYING.LIB COPYING.DOC AUTHORS ChangeLog Benchres aclocal.m4 \ + doc/gforth.ds doc/gforth.1 doc/version.texi.in \ doc/vmgen.texi doc/fdl.texi doc/gpl.texi \ gforth.el \ prim cache0.vmg cache1.vmg peeprules.vmg \ @@ -417,7 +418,7 @@ ENGINES = gforth$(EC)$(EXE) gforth-ditc$ ENGINES_FAST = gforth-fast$(EC)$(EXE) #gforth-native$(EXE) -GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs +GEN = $(ENGINES) $(ENGINES_FAST) kernel/version.fs gforth.elc # things that need a working forth system to be generated FORTH_GEN_ENGINE=engine/prim.i engine/prim_lab.i engine/prim_names.i \ @@ -597,12 +598,12 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) done $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION) @if test -d "$(DESTDIR)$(emacssitelispdir)"; then \ - $(INSTALL_DATA) $(srcdir)/gforth.el $(DESTDIR)$(emacssitelispdir); \ + $(INSTALL_DATA) gforth.elc $(DESTDIR)$(emacssitelispdir); \ else \ - echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ + echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \ 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 ./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 GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS @@ -640,7 +641,7 @@ check: gforths gforth.fi @echo "*** Check successful ***" checkone test: gforth$(EC)$(EXE) 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 -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 $(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 @@ -829,8 +830,8 @@ TAGS: gforth.TAGS tags: gforth.tags $(CP) gforth.tags $@ -install.TAGS: gforth.TAGS - sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS +install.TAGS: TAGS + sed 's;^\$(srcdir)/;;' TAGS|awk 'BEGIN {RS="\014\n"; ORS=RS} {if (NR==1) print $0; else print "$(datadir)/gforth/$(VERSION)/"$$0;}' >install.TAGS gforth.TAGS: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye @@ -843,10 +844,7 @@ gforth.tags: @kernel_fi@ gforth$(EC)$(EX rm tags prim.TAGS: prim.b prims2x.fs - #echo '2c\' >prim.TAGS.sed - #echo $(srcdir)/prim >>prim.TAGS.sed - #$(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" | sed -f prim.TAGS.sed >$@- - $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye" >$@- + $(FORTHP) prims2x.fs -e "s\" $(srcdir)/prim.b\" ' output-tag dup process-file bye"|sed 's#^./prim#prim#' >$@- $(CP) $@- $@ $(RM) $@- @@ -864,8 +862,14 @@ kernel.TAGS: kernel.tags: rm kernl16l$(EC).fi-; $(MAKE) @kernel_fi@ +#elc files +gforth.elc: gforth.el + emacs -batch -f batch-byte-compile $< + +#Documentation + doc/doc.fd: doc/makedoc.fs $(GFORTH_FI_SRC) code.fs objects.fs oof.fs moofglos.fs - $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs -e bye + $(FORTHK) -e "s\" doc/doc.fd\"" doc/makedoc.fs except.fs startup.fs code.fs objects.fs oof.fs moofglos.fs regexp.fs fft.fs -e bye doc/crossdoc.fd: $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) $(FORTHK) -e 's" mach32l.fs"' kernel/main.fs -e bye