--- gforth/Makefile.in 2003/08/04 20:32:34 1.269 +++ gforth/Makefile.in 2003/08/28 16:08:30 1.277 @@ -65,7 +65,7 @@ GCC = @CC@ CC = $(GCC) FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION) FORTHSIZES = @FORTHSIZES@ -FORTHS_ARGS = -p $(FORTHPATH)$(PATHSEP)$(srcdir) +FORTHS_ARGS = -p "$(FORTHPATH)$(PATHSEP)$(srcdir)" FORTH_ARGS = --die-on-signal $(FORTHS_ARGS) ENGINE = ./gforth FORTH = $(ENGINE) $(FORTH_ARGS) @@ -100,7 +100,7 @@ XDEFINES = @DEFS@ SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves DEBUGFLAG = @DEBUGFLAG@ -CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH=\"$(FORTHPATH)\" +CFLAGS = $(DEBUGFLAG) -I$(srcdir)/engine -I$(srcdir)/arch/$(machine) -O3 -Wall $(SWITCHES) -DDEFAULTPATH='"$(FORTHPATH)"' #John Wavrik should use -Xlinker -N to get a writable text (executable) XLDFLAGS = @LDFLAGS@ @@ -231,7 +231,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 +245,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 \ @@ -356,13 +356,13 @@ SOURCES = $(CVSDIRS) compat Makefile.in versions.bsh \ configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \ gforthmi.cmd glosgen.glo doc/glossaries.doc \ - $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) \ + $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \ timings.sc \ test/coretest.out test/checkans.out 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) #gforth-prof$(EXE) #gforth-native$(EXE) GEN = $(ENGINES) kernel/version.fs @@ -371,7 +371,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@ @@ -450,7 +451,7 @@ clean: mostlyclean -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \ engine/gforth$(EXE) engine/gforth-fast$(EXE) \ engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \ - engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE) + engine/gforth-ditc$(EXE) #engine/gforth-prof$(EXE) distclean: clean -$(RM) -rf config.cache config.log config.status \ @@ -470,11 +471,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 +494,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. @@ -531,7 +545,7 @@ install: gforth$(EXE) $(FORTH_SRC) $(ker echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \ fi -$(RM) gforth.fi - GFORTHD="./gforth-ditc -p$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(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 $(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(datadir)/gforth/$(VERSION) -i $(kernel_fi)" GFORTH="./gforth-ditc --die-on-signal -i $(kernel_fi) $(STARTUP)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP) $(INSTALL_DATA) gforth.fi $(libdir)/gforth/$(VERSION) $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS $(RM) gforth.fi install.TAGS @@ -629,12 +643,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 +687,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" >$@- @@ -716,7 +731,7 @@ engine/super2.i: prim.b prims2x.fs $(RM) $@- engine/costs.i: prim.b prims2x.fs - $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs dup process-file bye" >$@- + $(FORTHP) prims2x.fs -e "c-flag on s\" prim.b\" ' output-costs-gforth-simple ' output-costs-gforth-combined process-file bye" >$@- $(CP) $@- $@ $(RM) $@- @@ -782,7 +797,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 @@ -868,7 +883,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.