--- gforth/Makefile.in 2006/02/27 23:13:03 1.316 +++ gforth/Makefile.in 2006/10/22 16:54:00 1.333 @@ -88,8 +88,8 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) # in exboot.fs STARTUP = exboot.fs startup.fs @asm_fs@ @disasm_fs@ STRIP = strip -TEXI2DVI = texi2dvi -e -TEXI2PDF = texi2dvi --pdf -e +TEXI2DVI = @TEXI2DVI@ +TEXI2PDF = @TEXI2DVI@ --pdf DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo @@ -150,7 +150,6 @@ KERN_SRC = \ kernel/aliases0.fs \ kernel/aliases.fs \ kernel/args.fs \ - chains.fs \ kernel/cbr.fs \ kernel/cloop.fs \ kernel/cond.fs \ @@ -186,6 +185,7 @@ EC_SRC = \ asm/README \ asm/bitmask.fs \ asm/numref.fs \ + chains.fs \ asm/basic.fs \ asm/generic.fs \ asm/target.fs \ @@ -194,7 +194,8 @@ EC_SRC = \ ec/shex.fs \ ec/builttag.fs \ ec/dotx.fs \ - ec/nesting.fs + ec/nesting.fs \ + build-ec.in GFORTH_FI_SRC = \ assert.fs \ @@ -203,11 +204,11 @@ GFORTH_FI_SRC = \ blocks.fs \ bufio.fs \ code.fs \ - complex.fs \ debug.fs \ debugs.fs \ dis-gdb.fs \ ekey.fs \ + envos.fs \ savesys.fs \ environ.fs \ errors.fs \ @@ -215,7 +216,6 @@ GFORTH_FI_SRC = \ except.fs \ extend.fs \ float.fs \ - fft.fs \ glocals.fs \ hash.fs \ history.fs \ @@ -241,17 +241,18 @@ 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 \ - colorize.fs comp-i.fs \ + colorize.fs comp-i.fs complex.fs \ depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \ - envos.fs envos.dos envos.os2 etags.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 \ make-app.fs doc/makedoc.fs \ locate.fs more.fs other.fs prims2x.fs random.fs \ - sokoban.fs string.fs table.fs tags.fs \ + regexp.fs sokoban.fs string.fs table.fs tags.fs \ tt.fs \ unbuffer.fs wordsets.fs \ test/tester.fs test/coretest.fs test/postpone.fs test/dbltest.fs \ @@ -331,6 +332,11 @@ ARCHS = \ arch/r8c/asm.fs \ arch/r8c/asm-test.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: @@ -414,14 +420,14 @@ FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) ke FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB) FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gforth.fi # this is used for antidependences, -FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ +FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec #kernel dependencies KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs #distributed documentation -DOCDIST = doc/gforth.info doc/gforth.info* doc/gforth.ps \ - doc/vmgen.info doc/vmgen.info* doc/vmgen.ps +DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \ + doc/vmgen.info doc/vmgen.ps KERNLS = kernl16b.fi- kernl16l.fi- \ kernl32b.fi- kernl32l.fi- \ @@ -560,6 +566,7 @@ hpux-workaround: #we rebuild gforth.fi, because it contains some path names. #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership. install: gforth$(EXE) $(FORTH_SRC) $(kernel_fi) gforth.fi gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs + $(NORMAL_INSTALL) touch $(DESTDIR)$(siteforthdir)/siteinit.fs -$(RM) $(DESTDIR)$(bindir)/gforth$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) @@ -591,12 +598,14 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS + $(POST_INSTALL) $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/vmgen.info install-strip: install installdirs: mkinstalldirs + $(NORMAL_INSTALL) for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir); do \ $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done @@ -608,6 +617,7 @@ installdirs: mkinstalldirs #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE + $(NORMAL_UNINSTALL) -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) @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" @@ -621,9 +631,10 @@ check: gforths gforth.fi @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/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"| \ @@ -924,16 +935,15 @@ stamp-h.in: configure.in aclocal.m4 echo timestamp > $(srcdir)/stamp-h.in engine/config.h: stamp-h -stamp-h: engine/config.h.in config.status +stamp-h: engine/config.h.in config.status stamp-h.in ./config.status -Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in +Makefile Makedist engine/Makefile gforthmi vmgen machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in ./config.status config.status: configure ./config.status --recheck - #create files for DOS, because DOS cannot do it itself makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in sed -f mkdosmf.sed makefile.dos