--- gforth/Makefile.in 2007/03/25 21:30:59 1.347 +++ gforth/Makefile.in 2007/10/22 20:11:43 1.370 @@ -59,12 +59,13 @@ CP = cp -p MV = mv TAR = tar cf - INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s +INSTALL_PROGRAM = @INSTALL_PROGRAM@ MASSAGE_EXE = @MASSAGE_EXE@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_INFO = @INSTALL_INFO@ LN_S = @LN_S@ +M4 = @M4@ GCC = @CC@ CC = $(GCC) FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) @@ -120,13 +121,16 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ -bindir = $(exec_prefix)/bin +bindir = @bindir@ #read-only architecture-independent files -datadir = $(prefix)/share +datarootdir = @datarootdir@ +datadir = @datadir@ #read-only architecture-dependent non-ascii files -libdir = $(prefix)/lib -infodir = $(prefix)/info -mandir = $(prefix)/man +libdir = @libdir@ +includedir = @includedir@ +infodir = @infodir@ +htmldir = @htmldir@ +mandir = @mandir@ man1dir= $(mandir)/man1 man1ext= .1 #older emacses have their site-lisp in $(libdir)/emacs/ @@ -223,6 +227,7 @@ GFORTH_FI_SRC = \ hash.fs \ history.fs \ intcomp.fs \ + libcc.fs \ locals.fs \ look.fs \ quotes.fs \ @@ -233,6 +238,7 @@ GFORTH_FI_SRC = \ source.fs \ startup.fs \ struct.fs \ + struct0x.fs \ stuff.fs \ tasker.fs \ termsize.fs \ @@ -258,11 +264,12 @@ 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/coremore.fs test/gforth-nofast.fs test/libcc.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 \ @@ -380,13 +387,13 @@ 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 \ engine/engine.c engine/main.c \ - engine/io.c engine/support.c engine/signals.c \ + engine/io.c engine/support.c engine/signals.c engine/libcc.h.in \ $(ARCHS) \ engine/profile.c \ engine/getopt.c engine/getopt1.c engine/getopt.h engine/select.c \ @@ -412,7 +419,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 \ @@ -431,7 +438,7 @@ FORTH_GEN = $(FORTH_GEN0) @KERNEL@ gfor FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ build-ec #kernel dependencies -KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs +KERN_DEPS = $(KERN_SRC) kernel/version.fs machpc.fs $(FORTH_GEN0) compat/strcomp.fs gforth$(EXE) #distributed documentation DOCDIST = doc/gforth.info doc/gforth.info-* doc/gforth.ps \ @@ -466,7 +473,6 @@ version: Makefile.in configure.in # shell und file utilities. kernel/version.fs: version - $(MAKE) gforth$(EC)$(EXE) echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs more: engines $(FORTH_GEN) $(GEN) @@ -506,7 +512,8 @@ clean: mostlyclean -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ engine/gforth$(EC)$(EXE) engine/gforth-fast$(EC)$(EXE) \ engine/gforth-native$(EC)$(EXE) engine/gforth-itc$(EC)$(EXE) \ - engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) + engine/gforth-ditc$(EC)$(EXE) engine/gforth-prof$(EC)$(EXE) \ + engine/prim-s.i distclean: clean -$(RM) -rf config.cache config.log config.status \ @@ -568,7 +575,7 @@ hpux-workaround: install: gforth$(EC)$(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$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen + -$(RM) $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi #$(DESTDIR)$(bindir)/vmgen -$(RM) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) -$(RM) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(INSTALL_PROGRAM) gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) @@ -580,35 +587,37 @@ install: gforth$(EC)$(EXE) $(FORTH_SRC) $(INSTALL_PROGRAM) gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) (cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EC)$(EXE) gforth-itc$(EC)$(EXE)) $(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION) - $(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION) + #$(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION) $(INSTALL_PROGRAM) gforth-ditc $(DESTDIR)$(libdir)/gforth/$(VERSION) (cd $(DESTDIR)$(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi) - (cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen) + #(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 $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done + -for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done for i in $(FORTH_SRC) $(COMPAT) prim; do \ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ 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)" ./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 + $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION) $(POST_INSTALL) $(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 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 \ + for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION); do \ $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done for i in $(CVSDIRS); do \ @@ -620,7 +629,7 @@ installdirs: mkinstalldirs #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)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(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" check: gforths gforth.fi @@ -632,15 +641,15 @@ check: gforths gforth.fi $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1 @echo "*** Check successful ***" -checkone test: gforth$(EC)$(EXE) gforth.fi - $(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 +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 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 $(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 + tr -d '\015' | grep -v '^#line '|diff -c - engine/prim-s.i check-nofast: gforth$(EC)$(EXE) gforth.fi $(FORTHS) test/gforth-nofast.fs -e bye @@ -737,16 +746,16 @@ kernl64l$(EC).fi: $(KERNLS) # -$(CP) $< $@ gforth.fi: $(kernel_fi) gforthmi gforth$(EC)$(EXE) 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)" ./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` ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP) # ------------- Make c-engine prim.b: prim cache0.vmg - m4 -s $(srcdir)/prim >$@ + $(M4) -Dcondbranch_opt=0 $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary -prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg - m4 -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg -s $(srcdir)/prim >$@ +prim-fast.b: prim cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg peeprules.vmg Makefile.in + $(M4) -Dcondbranch_opt=@condbranch_opt@ -DSTACK_CACHE_FILE=cache-fast$(STACK_CACHE_DEFAULT_FAST).vmg $(srcdir)/prim >$@ sleep 1 #should make hpux-workaround unnecessary $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs @@ -755,6 +764,9 @@ $(FORTH_GEN_ENGINE_FAST): prim-fast.b pr $(FORTH_GEN_ENGINE): prim.b prims2x.fs GFORTH="$(FORTHP)" $(srcdir)/gfgen +engine/prim-s.i: engine/prim.i + grep -v '^#line ' $(srcdir)/engine/prim.i >$@ + kernel/aliases.fs: prim.b prims2x.fs kernel/aliases0.fs $(CP) kernel/aliases0.fs $@- $(FORTHP) prims2x.fs -e "forth-flag on s\" prim.b\" ' output-alias ' noop process-file bye" >>$@- @@ -819,8 +831,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 @@ -833,10 +845,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) $@- @@ -854,8 +863,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 @@ -869,6 +884,7 @@ doc/gforth.texi: doc/gforth.ds prim.b ds checkdoc: doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi $(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye -grep unknown doc/gforth.texi + -grep doc- doc/gforth.texi dvi: doc/gforth.dvi doc/vmgen.dvi