--- gforth/Makefile.in 2009/03/17 17:40:49 1.445 +++ gforth/Makefile.in 2010/12/31 18:09:01 1.455 @@ -1,6 +1,6 @@ #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,2010 Free Software Foundation, Inc. #This file is part of Gforth. @@ -129,7 +129,7 @@ datarootdir = @datarootdir@ datadir = @datadir@ #read-only architecture-dependent non-ascii files libdir = @libdir@ -libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/ +libccdir = $(subst $(DESTDIR),,$(libdir)/gforth/$(VERSION)/libcc-named/) includedir = @includedir@ infodir = @infodir@ htmldir = @htmldir@ @@ -189,7 +189,8 @@ KERN_SRC = \ kernel/doers.fs \ kernel/getdoers.fs \ kernel/pass.fs \ - kernel/xchars.fs + kernel/xchars.fs \ + string.fs EC_SRC = \ asm/README \ @@ -207,7 +208,7 @@ EC_SRC = \ ec/nesting.fs \ build-ec.in -GFORTH_FI_SRC = \ +GFORTH_FI_SRC1=\ assert.fs \ backtrac.fs \ blocked.fb \ @@ -218,7 +219,8 @@ GFORTH_FI_SRC = \ debugs.fs \ dis-gdb.fs \ ekey.fs \ - envos.fs \ + +GFORTH_FI_SRC2=\ savesys.fs \ environ.fs \ errors.fs \ @@ -235,6 +237,7 @@ GFORTH_FI_SRC = \ locals.fs \ look.fs \ mkdir.fs \ + prelude.fs \ quotes.fs \ search.fs \ see.fs \ @@ -254,17 +257,30 @@ GFORTH_FI_SRC = \ arch/386/asm.fs arch/386/disasm.fs \ arch/amd64/asm.fs arch/amd64/disasm.fs \ arch/alpha/asm.fs arch/alpha/disasm.fs arch/alpha/testasm.fs\ + arch/arm/asm.fs arch/arm/disasm.fs \ + arch/arm/testdisasm.fs arch/arm/testdisasm.out arch/arm/Makefile \ arch/mips/asm.fs arch/mips/disasm.fs arch/mips/insts.fs \ arch/mips/testasm.fs arch/mips/testdisasm.fs \ arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs +# execlude envos.fs into list of distributed sources +GFORTH_FI_DIST_SRC = \ + $(GFORTH_FI_SRC1) \ + $(GFORTH_FI_SRC2) + +GFORTH_FI_SRC = \ + $(GFORTH_FI_SRC1) \ + envos.fs \ + $(GFORTH_FI_SRC2) + LIBCC_SRC = cstr.fs unix/socket.fs LIBCC_DIST_SRC = libffi.fs fflib.fs $(LIBCC_SRC) LIBCC_BUILD_SRC = @LIBCC_BUILD_SRC@ $(LIBCC_SRC) -FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_DIST_SRC) \ + +FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST_SRC) $(EC_SRC) $(LIBCC_DIST_SRC) \ ans-report.fs ansi.fs answords.fs \ colorize.fs comp-i.fs complex.fs \ depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ @@ -281,6 +297,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) 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 \ + test/macros.fs \ bubble.fs siev.fs matrix.fs fib.fs \ oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \ moofglos.fs fixpath.fs \ @@ -295,6 +312,7 @@ COMPAT = compat/README \ compat/exception.fs \ compat/execute-parsing.fs \ compat/loops.fs \ + compat/macros.fs \ compat/required.fs \ compat/strcomp.fs \ compat/struct.fs \ @@ -310,6 +328,7 @@ ARCHS = \ arch/generic/machine.h \ arch/m68k/machine.h \ arch/mips/machine.h \ + arch/mips/check_prim.c \ arch/386/machine.h \ arch/hppa/machine.h \ arch/hppa/cache.c \ @@ -427,9 +446,9 @@ SOURCES = $(ENGINE_SOURCES) compat Makef RCS_FILES = ToDo model high-level -ENGINES = gforth$(EC)$(EXE) gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) +ENGINES = gforth$(EC)$(EXE) @NO_EC@ gforth-ditc$(EC)$(EXE) gforth-itc$(EC)$(EXE) $(PROFEXES) -ENGINES_FAST = gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) +ENGINES_FAST = @NO_EC@ gforth-fast$(OPT)$(EC)$(EXE) #gforth-native$(OPT)$(EC)$(EXE) GEN = $(ENGINES) $(ENGINES_FAST) gforth.elc @@ -445,7 +464,7 @@ FORTH_GEN_ENGINE_FAST= \ engine/costs-fast.i engine/super2-fast.i FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB) -FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi +FORTH_GEN = $(FORTH_GEN0) @KERNEL@ @NO_EC@ gforth.fi # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec @@ -474,7 +493,7 @@ GEN_PRECIOUS = $(FORTH_GEN) $(KERNLS) \ .SUFFIXES: .SUFFIXES: .c .o -all: kernel/version.fs more check +all: kernel/version.fs more @NO_EC@ check # use this dependency for phony targets just as mostlyclean,... FORCE: ; @@ -613,7 +632,7 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) (cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) -$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(DESTDIR)$(man1dir) -for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done - for i in $(FORTH_SRC) $(COMPAT) prim; do \ + for i in $(FORTH_SRC) $(COMPAT) envos.fs prim; do \ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ done $(INSTALL_DATA) $(kernel_fi) $(DESTDIR)$(datadir)/gforth/$(VERSION) @@ -657,7 +676,7 @@ uninstall: FORCE build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE $(RMTREE) lib/gforth/$(VERSION)/libcc-named/ - for i in $(LIBCC_BUILD_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" $(srcdir)/$$i -e bye; done + for i in $(LIBCC_BUILD_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\" $(DESTDIR)$(libccdir)\" ; is replace-rpath" $(srcdir)/$$i -e bye; done check: gforths gforth.fi $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1 @@ -673,7 +692,7 @@ 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/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 + $(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) prims2x.fs -e \ "c-flag on s\" prim.i\" out-filename 2! s\" $(srcdir)/prim.b\" ' output-c ' output-c-combined process-file bye"| \ @@ -823,7 +842,7 @@ gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE $(CP) engine/$@ $@ && \ $(MASSAGE_EXE) $@; \ @GFORTH_EXE@; \ - $(MAKE) checkone check-nofast ENGINE=./engine/$@; \ + @NO_EC@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \ fi optgforth: @@ -837,7 +856,7 @@ gforth-fast$(OPT)$(EC)$(EXE): $(ENGINE_S $(CP) engine/$@ $@ && \ $(MASSAGE_EXE) $@; \ @GFORTHFAST_EXE@; \ - $(MAKE) checkone ENGINE=./engine/$@; \ + @NO_EC@ $(MAKE) checkone ENGINE=./engine/$@; \ fi optgforth-fast: