Diff for /gforth/Makefile.in between versions 1.269 and 1.279

version 1.269, 2003/08/04 20:32:34 version 1.279, 2003/09/01 22:12:46
Line 65  GCC = @CC@ Line 65  GCC = @CC@
 CC      = $(GCC)  CC      = $(GCC)
 FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)  FORTHPATH = .$(PATHSEP)$(libdir)/gforth/site-forth$(PATHSEP)$(siteforthdir)$(PATHSEP)$(libdir)/gforth/$(VERSION)$(PATHSEP)$(datadir)/gforth/$(VERSION)
 FORTHSIZES = @FORTHSIZES@  FORTHSIZES = @FORTHSIZES@
 FORTHS_ARGS =  -p $(FORTHPATH)$(PATHSEP)$(srcdir)  FORTHS_ARGS =  -p "$(FORTHPATH)$(PATHSEP)$(srcdir)"
 FORTH_ARGS = --die-on-signal $(FORTHS_ARGS)  FORTH_ARGS = --die-on-signal $(FORTHS_ARGS)
 ENGINE = ./gforth  ENGINE = ./gforth
 FORTH   = $(ENGINE) $(FORTH_ARGS)  FORTH   = $(ENGINE) $(FORTH_ARGS)
Line 88  FORTHK = $(ENGINE) $(FORTHKFLAGS) Line 88  FORTHK = $(ENGINE) $(FORTHKFLAGS)
 STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@  STARTUP = -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP   = strip  STRIP   = strip
 TEXI2DVI = texi2dvi -e  TEXI2DVI = texi2dvi -e
   TEXI2PDF = texi2dvi --pdf -e
 DVI2PS  = dvips -t letterSize -Z  DVI2PS  = dvips -t letterSize -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/  #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 MAKEINFO = makeinfo  MAKEINFO = makeinfo
Line 100  XDEFINES = @DEFS@ Line 101  XDEFINES = @DEFS@
 SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions  SWITCHES = $(XCFLAGS) $(XDEFINES) #-DNDEBUG #turn off assertions
 ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves  ENGINE_FLAGS = @ENGINE_FLAGS@ -fno-defer-pop -fcaller-saves
 DEBUGFLAG = @DEBUGFLAG@  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)  #John Wavrik should use -Xlinker -N to get a writable text (executable)
 XLDFLAGS = @LDFLAGS@  XLDFLAGS = @LDFLAGS@
Line 231  GFORTH_FI_SRC = \ Line 232  GFORTH_FI_SRC = \
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \
         ans-report.fs ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         colorize.fs comp-i.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 \          envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
         glosgen.fs gray.fs httpd.fs proxy.fs \          glosgen.fs gray.fs httpd.fs proxy.fs \
         make-app.fs doc/makedoc.fs \          make-app.fs doc/makedoc.fs \
Line 245  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 246  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC)
         bubble.fs siev.fs matrix.fs fib.fs \          bubble.fs siev.fs matrix.fs fib.fs \
         oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \          oof.fs oofsampl.fs objects.fs objexamp.fs mini-oof.fs moof-exm.fs \
         moofglos.fs fixpath.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 = compat/README \
         compat/anslocal.fs \          compat/anslocal.fs \
Line 356  SOURCES = $(CVSDIRS) compat Makefile.in Line 357  SOURCES = $(CVSDIRS) compat Makefile.in
         versions.bsh \          versions.bsh \
         configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \          configure.cmd mkos2mf.sed os2conf.h makefile.os2 engine/makefile.os2 \
         gforthmi.cmd glosgen.glo doc/glossaries.doc \          gforthmi.cmd glosgen.glo doc/glossaries.doc \
         $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) \          $(INCLUDES) $(FORTH_SRC) $(COMPAT) $(VMGEN_EX) $(VMGEN_EX2) \
         timings.sc \          timings.sc \
         test/coretest.out test/checkans.out          test/coretest.out test/checkans.out
   
 RCS_FILES =  ToDo model high-level  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  GEN = $(ENGINES) kernel/version.fs
   
Line 371  FORTH_GEN_ENGINE=engine/prim.i engine/pr Line 372  FORTH_GEN_ENGINE=engine/prim.i engine/pr
         engine/prim_superend.i engine/profile.i \          engine/prim_superend.i engine/profile.i \
         engine/prim_num.i engine/prim_grp.i \          engine/prim_num.i engine/prim_grp.i \
         engine/costs.i engine/super2.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  FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,  # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@   FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ 
Line 450  clean:  mostlyclean Line 452  clean:  mostlyclean
                 -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \                  -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
                 engine/gforth$(EXE) engine/gforth-fast$(EXE) \                  engine/gforth$(EXE) engine/gforth-fast$(EXE) \
                 engine/gforth-native$(EXE) engine/gforth-itc$(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  distclean:      clean
                 -$(RM) -rf config.cache config.log config.status \                  -$(RM) -rf config.cache config.log config.status \
Line 470  virtualclean: mostlyclean Line 472  virtualclean: mostlyclean
 #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the  #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the
 #Makefile if it contains our dist rules.  Therefore we have put these  #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).  #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.in >machpc.fs
                 $(MAKE) -f Makedist d$@                  $(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.in >machpc.fs
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
                   -$(RM) machpc.fs
   
 srcdist:        Makedist FORCE  srcdist:        Makedist FORCE
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
Line 488  docdist: Makedist FORCE Line 495  docdist: Makedist FORCE
 htmldist:       Makedist FORCE  htmldist:       Makedist FORCE
                 $(MAKE) -f Makedist d$@                  $(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.in >machpc.fs
                 $(MAKE) -f Makedist d$@                  $(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.in >machpc.fs
                 $(MAKE) -f Makedist d$@                  $(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  #strip gforth, because the debugging stuff is hardly useful once
 # gforth manages to execute more than a few primitives.  # gforth manages to execute more than a few primitives.
Line 531  install: gforth$(EXE) $(FORTH_SRC) $(ker Line 546  install: gforth$(EXE) $(FORTH_SRC) $(ker
                         echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \                          echo ">>>>>Please install $(srcdir)/gforth.el in your .../emacs/site-lisp directory"; \
                 fi                  fi
                 -$(RM) gforth.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) gforth.fi $(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) gforth.fi install.TAGS                  $(RM) gforth.fi install.TAGS
Line 629  kernl64b.fi-: $(KERN_DEPS) mach64b.fs Line 644  kernl64b.fi-: $(KERN_DEPS) mach64b.fs
                 $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"                  $(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
   
 #Solaris make does not like that:  #Solaris make does not like that:
 #kernl-%.fi:    arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)  @GNUMAKE@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"  @GNUMAKE@               $(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
 #               if [ -f `echo $< | sed s/fs/sh/` ]; \  @GNUMAKE@               if [ -f `echo $< | sed s/fs/sh/` ]; \
 #               then sh `echo $< | sed s/fs/sh/` $@; \  @GNUMAKE@               then sh `echo $< | sed s/fs/sh/` $@; \
 #               else $(CP) $@- $@; \  @GNUMAKE@               else $(CP) $@- $@; \
 #               fi  @GNUMAKE@               fi
   
 #SunOS make does not like that  #SunOS make does not like that
 #arch/%/mach.fs:        arch/%/prim.fs arch/%/asm.fs  #arch/%/mach.fs:        arch/%/prim.fs arch/%/asm.fs
Line 673  gforth.fi: $(kernel_fi) gforthmi gforth$ Line 688  gforth.fi: $(kernel_fi) gforthmi gforth$
 # ------------- Make c-engine  # ------------- Make c-engine
   
 prim.b:         prim peeprules.vmg  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  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" >$@-                  $(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" >$@-
Line 716  engine/super2.i: prim.b prims2x.fs Line 732  engine/super2.i: prim.b prims2x.fs
                 $(RM) $@-                  $(RM) $@-
   
 engine/costs.i: prim.b prims2x.fs  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) $@- $@                  $(CP) $@- $@
                 $(RM) $@-                  $(RM) $@-
   
Line 782  tags:  gforth.tags Line 798  tags:  gforth.tags
                 $(CP) gforth.tags $@                  $(CP) gforth.tags $@
   
 install.TAGS:   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  gforth.TAGS:    @kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
                 $(FORTHK) etags.fs except.fs startup.fs -e bye                  $(FORTHK) etags.fs except.fs startup.fs -e bye
Line 834  checkdoc: doc/gforth.ds prim.b ds2texi.f Line 850  checkdoc: doc/gforth.ds prim.b ds2texi.f
   
 dvi:            doc/gforth.dvi doc/vmgen.dvi  dvi:            doc/gforth.dvi doc/vmgen.dvi
   
   pdf:            doc/gforth.pdf doc/vmgen.pdf
   
 doc/gforth.dvi doc/gforth.fns:  $(GFORTH_TEXI)  doc/gforth.dvi doc/gforth.fns:  $(GFORTH_TEXI)
                 cd doc; $(TEXI2DVI) gforth.texi                  cd doc; $(TEXI2DVI) gforth.texi
   
   doc/gforth.pdf: $(GFORTH_TEXI)
                   cd doc; $(TEXI2PDF) gforth.texi
   
 doc/vmgen.dvi:  $(VMGEN_TEXI)  doc/vmgen.dvi:  $(VMGEN_TEXI)
                 cd doc; $(TEXI2DVI) vmgen.texi                  cd doc; $(TEXI2DVI) vmgen.texi
   
   doc/vmgen.pdf:  $(VMGEN_TEXI)
                   cd doc; $(TEXI2PDF) vmgen.texi
   
 doc/gforth.ps:  doc/gforth.dvi  doc/gforth.ps:  doc/gforth.dvi
                 $(DVI2PS) doc/gforth.dvi -o $@                  $(DVI2PS) doc/gforth.dvi -o $@
   
Line 868  doc/gforth.txt: $(GFORTH_TEXI) Line 892  doc/gforth.txt: $(GFORTH_TEXI)
 doc/vmgen.txt:  $(VMGEN_TEXI)  doc/vmgen.txt:  $(VMGEN_TEXI)
                 -cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt                  -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  # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.  # `Automatic Remaking' in GNU Autoconf documentation.

Removed from v.1.269  
changed lines
  Added in v.1.279


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>