--- gforth/Makefile.in 2006/05/20 07:07:28 1.331 +++ gforth/Makefile.in 2007/02/17 16:23:06 1.340 @@ -1,6 +1,6 @@ #Makefile for Gforth -#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc. #This file is part of Gforth. @@ -58,6 +58,7 @@ MV = mv TAR = tar cf - INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s +MASSAGE_EXE = @MASSAGE_EXE@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ @@ -142,7 +143,7 @@ CVSDIRS = CVS engine/CVS kernel/CVS doc/ arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \ arch/arm/CVS arch/r8c/CVS -INCLUDES = engine/forth.h engine/threaded.h engine/io.h +INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h KERN_SRC = \ mach16b.fs mach16l.fs mach32b.fs mach32l.fs mach64b.fs mach64l.fs \ @@ -241,7 +242,8 @@ GFORTH_FI_SRC = \ arch/amd64/asm.fs arch/amd64/disasm.fs \ arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\ arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \ - 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 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ @@ -253,7 +255,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) locate.fs more.fs other.fs prims2x.fs random.fs \ regexp.fs sokoban.fs string.fs table.fs tags.fs \ tt.fs \ - unbuffer.fs wordsets.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/other.fs test/signals.fs test/checkans.fs \ @@ -368,7 +370,7 @@ VMGEN_EX2 = $(VMGEN_EX:vmgen-ex/%=vmgen- SOURCES = $(CVSDIRS) compat Makefile.in Makedist.in engine/Makefile.in \ gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \ configure.in configure config.sub config.guess elisp-comp missing \ - engine/config.h.in stamp-h.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 \ @@ -571,8 +573,10 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) $(INSTALL_PROGRAM) gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-$(VERSION)$(EXE) gforth$(EXE)) $(INSTALL_PROGRAM) gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) + -$(MASSAGE_EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-fast-$(VERSION)$(EXE) gforth-fast$(EXE)) $(INSTALL_PROGRAM) gforth-itc$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EXE) gforth-itc$(EXE)) @@ -621,23 +625,27 @@ uninstall: FORCE @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(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 - $(MAKE) checkone ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-itc" >/dev/null 2>&1 - $(MAKE) checkone ENGINE="./gforth-ditc" >/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-ditc" >/dev/null 2>&1 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1 - $(MAKE) checkone 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 @echo "*** Check successful ***" checkone test: gforth$(EXE) gforth.fi - $(FORTH) test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs test/string.fs test/float.fs test/gforth.fs test/deferred.fs test/coreext.fs -e bye | 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 -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 $(FORTH) code.fs test/checkans.fs -e bye | tr -d '\015' | diff -c - $(srcdir)/test/checkans.out $(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"| \ tr -d '\015' | diff -c - $(srcdir)/engine/prim.i +check-nofast: gforth$(EXE) gforth.fi + $(FORTHS) test/gforth-nofast.fs -e bye + test/primtest.fi: test/primtest.fs mach32l.fs cross.fs $(FORTHB) -e 's" mach32b.fs"' $(srcdir)/test/primtest.fs -e "save-cross $@ $(bindir)/gforth-$(VERSION) bye" @@ -772,14 +780,17 @@ kernel/prim.fs: prim.b prims2x.fs kernel gforth$(EXE): engines -$(CP) gforth$(EXE) gforth~ $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ @GFORTH_EXE@ gforth-fast$(EXE): engines-fast $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ @GFORTHFAST_EXE@ gforth-native$(EXE): engines-fast $(CP) engine/$@ $@ + -$(MASSAGE_EXE) $@ #@GFORTHX_EXE@ gforth-itc$(EXE): engines