--- gforth/Makefile.in 2003/08/15 14:07:03 1.271 +++ gforth/Makefile.in 2003/09/08 13:03:05 1.280 @@ -88,6 +88,7 @@ FORTHK = $(ENGINE) $(FORTHKFLAGS) STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@ STRIP = strip TEXI2DVI = texi2dvi -e +TEXI2PDF = texi2dvi --pdf -e DVI2PS = dvips -t letterSize -Z #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/ MAKEINFO = makeinfo @@ -126,6 +127,9 @@ man1ext= .1 emacssitelispdir=@lispdir@ siteforthdir=$(datadir)/gforth/site-forth +PROFOBJS = @PROFOBJS@ +PROFEXES = @PROFEXES@ + CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ compat/CVS unix/CVS \ arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \ @@ -231,7 +235,7 @@ GFORTH_FI_SRC = \ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \ ans-report.fs ansi.fs answords.fs \ colorize.fs comp-i.fs \ - doskey.fs ds2texi.fs \ + dosekey.fs doskey.fs ds2texi.fs \ envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \ glosgen.fs gray.fs httpd.fs proxy.fs \ make-app.fs doc/makedoc.fs \ @@ -245,7 +249,7 @@ FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) 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 \ - add.fs lib.fs sieve.fs unix/socket.fs + add.fs lib.fs oldlib.fs fflib.fs sieve.fs unix/socket.fs COMPAT = compat/README \ compat/anslocal.fs \ @@ -362,7 +366,7 @@ SOURCES = $(CVSDIRS) compat Makefile.in RCS_FILES = ToDo model high-level -ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-prof$(EXE) #gforth-native$(EXE) +ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) $(PROFEXES) #gforth-native$(EXE) GEN = $(ENGINES) kernel/version.fs @@ -371,7 +375,8 @@ FORTH_GEN_ENGINE=engine/prim.i engine/pr engine/prim_superend.i engine/profile.i \ engine/prim_num.i engine/prim_grp.i \ engine/costs.i engine/super2.i -FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs +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 # this is used for antidependences, FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ @@ -470,11 +475,16 @@ virtualclean: mostlyclean #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the #Makefile if it contains our dist rules. Therefore we have put these #rules in Makedist (you can use them with GNU make on these systems). -dist: Makedist FORCE + +dist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs -dosdist: Makedist FORCE +dosdist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs srcdist: Makedist FORCE $(MAKE) -f Makedist d$@ @@ -488,12 +498,20 @@ docdist: Makedist FORCE htmldist: Makedist FORCE $(MAKE) -f Makedist d$@ -bindist: Makedist FORCE +bindist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs -binonlydist: Makedist FORCE +binonlydist: Makedist machpc.fs FORCE + -sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' machpc.fs $(MAKE) -f Makedist d$@ + -$(RM) machpc.fs +#HPUX make breaks the cycle differently when the dates are equal, so +# touch some of the files if it acts up +hpux-workaround: + touch $(FORTH_GEN_PRIMB) #strip gforth, because the debugging stuff is hardly useful once # gforth manages to execute more than a few primitives. @@ -629,12 +647,12 @@ kernl64b.fi-: $(KERN_DEPS) mach64b.fs $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye" #Solaris make does not like that: -#kernl-%.fi: arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) -# $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" -# if [ -f `echo $< | sed s/fs/sh/` ]; \ -# then sh `echo $< | sed s/fs/sh/` $@; \ -# else $(CP) $@- $@; \ -# fi +@GNUMAKE@kernl-%.fi: arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0) +@GNUMAKE@ $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye" +@GNUMAKE@ if [ -f `echo $< | sed s/fs/sh/` ]; \ +@GNUMAKE@ then sh `echo $< | sed s/fs/sh/` $@; \ +@GNUMAKE@ else $(CP) $@- $@; \ +@GNUMAKE@ fi #SunOS make does not like that #arch/%/mach.fs: arch/%/prim.fs arch/%/asm.fs @@ -673,7 +691,8 @@ gforth.fi: $(kernel_fi) gforthmi gforth$ # ------------- Make c-engine prim.b: prim peeprules.vmg - m4 -s $(srcdir)/prim >$@ + m4 -s $(srcdir)/prim >$@ + sleep 1 #should make hpux-workaround unnecessary engine/prim.i: prim.b prims2x.fs $(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" save-mem out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@- @@ -782,7 +801,7 @@ tags: gforth.tags $(CP) gforth.tags $@ install.TAGS: gforth.TAGS - sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS + sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS gforth.TAGS: @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye @@ -834,12 +853,20 @@ checkdoc: doc/gforth.ds prim.b ds2texi.f dvi: doc/gforth.dvi doc/vmgen.dvi +pdf: doc/gforth.pdf doc/vmgen.pdf + doc/gforth.dvi doc/gforth.fns: $(GFORTH_TEXI) cd doc; $(TEXI2DVI) gforth.texi +doc/gforth.pdf: $(GFORTH_TEXI) + cd doc; $(TEXI2PDF) gforth.texi + doc/vmgen.dvi: $(VMGEN_TEXI) cd doc; $(TEXI2DVI) vmgen.texi +doc/vmgen.pdf: $(VMGEN_TEXI) + cd doc; $(TEXI2PDF) vmgen.texi + doc/gforth.ps: doc/gforth.dvi $(DVI2PS) doc/gforth.dvi -o $@ @@ -868,7 +895,7 @@ doc/gforth.txt: $(GFORTH_TEXI) doc/vmgen.txt: $(VMGEN_TEXI) -cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt -doc: info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS +doc: gforth.fi info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation.