Diff for /gforth/Makefile.in between versions 1.393 and 1.407

version 1.393, 2008/04/05 20:34:13 version 1.407, 2008/07/15 09:30:12
Line 66  INSTALL_INFO = @INSTALL_INFO@ Line 66  INSTALL_INFO = @INSTALL_INFO@
 LN_S    = @LN_S@  LN_S    = @LN_S@
 M4      = @M4@  M4      = @M4@
 GCC     = @CC@  GCC     = @CC@
 PREFORTH        = @PREFORTH@ -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"  PREFORTH        = ./preforth -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)"
 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@
Line 107  SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTD Line 107  SWITCHES = $(XCFLAGS) $(XDEFINES) $(OPTD
 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)"'
   CPPFLAGS = @CPPFLAGS@
   
 #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 128  datarootdir = @datarootdir@ Line 129  datarootdir = @datarootdir@
 datadir = @datadir@  datadir = @datadir@
 #read-only architecture-dependent non-ascii files  #read-only architecture-dependent non-ascii files
 libdir = @libdir@  libdir = @libdir@
   libccdir = $(libdir)/gforth/$(VERSION)/libcc-named/
 includedir = @includedir@  includedir = @includedir@
 infodir = @infodir@  infodir = @infodir@
 htmldir = @htmldir@  htmldir = @htmldir@
Line 254  GFORTH_FI_SRC = \ Line 256  GFORTH_FI_SRC = \
         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          arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs
   
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \  LIBCC_SRC = libffi.fs fflib.fs unix/socket.fs
   
   FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) $(LIBCC_SRC) \
         ans-report.fs ansi.fs answords.fs \          ans-report.fs ansi.fs answords.fs \
         colorize.fs comp-i.fs complex.fs \          colorize.fs comp-i.fs complex.fs \
         depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \          depth-changes.fs dosekey.fs doskey.fs ds2texi.fs \
Line 274  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) Line 278  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 oldlib.fs fflib.fs libffi.fs sieve.fs unix/socket.fs \          add.fs lib.fs oldlib.fs sieve.fs \
         endtry-iferror.fs recover-endtry.fs          endtry-iferror.fs recover-endtry.fs
   
 COMPAT = compat/README \  COMPAT = compat/README \
Line 394  ENGINE_SOURCES = engine/Makefile.in engi Line 398  ENGINE_SOURCES = engine/Makefile.in engi
         engine/makefile.dos engine/makefile.os2          engine/makefile.dos engine/makefile.os2
   
 SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \  SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
         gforthmi.in vmgen.in gfgen README.vmgen NEWS.vmgen \          gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
         configure.in configure config.sub config.guess elisp-comp missing \          configure.in configure config.sub config.guess elisp-comp missing \
         stamp-h.in envos.fs.in \          stamp-h.in envos.fs.in \
         iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \          iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
Line 524  distclean: clean Line 528  distclean: clean
                 -$(RM) -rf config.cache config.log config.status \                  -$(RM) -rf config.cache config.log config.status \
                 engine/config.h Makefile Makedist engine/Makefile \                  engine/config.h Makefile Makedist engine/Makefile \
                 stamp-h engine/stamp-h \                  stamp-h engine/stamp-h \
                 doc/version.texi gforthmi vmgen \                  doc/version.texi gforthmi vmgen preforth \
                 prim-fast.b $(FORTH_GEN_ENGINE_FAST)                  prim-fast.b $(FORTH_GEN_ENGINE_FAST)
   
 #realclean is useless, but dangerous, so it's commented out  #realclean is useless, but dangerous, so it's commented out
Line 536  virtualclean: mostlyclean Line 540  virtualclean: mostlyclean
                 -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \                  -$(RM) -rf gforth.fns gforth.texi gforth.ps gforth.info* \
                 gforth-$(VERSION).tar.gz config.cache *~ */*~                  gforth-$(VERSION).tar.gz config.cache *~ */*~
   
   maintainer-clean: realclean
   
 #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).
Line 609  install: gforth$(EC)$(EXE) $(FORTH_SRC) Line 615  install: gforth$(EC)$(EXE) $(FORTH_SRC)
                         echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \                          echo ">>>>>Please install gforth.elc in your .../emacs/site-lisp directory"; \
                 fi                  fi
                 -$(RM) gforth.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)" includedir=$(includedir) bindir=$bindir GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./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) libccdir=$(libccdir) GFORTHPATH=.:"$$GFORTHPATH" GFORTHDESTDIR="$(DESTDIR)" ./gforthmi gforth.fi $(FORTHSIZES) $(STARTUP)
                 $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)                  $(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) gforth.fi install.TAGS                  $(RM) gforth.fi install.TAGS
                 $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)                  $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)
                   for i in $(LIBCC_SRC); do $(DESTDIR)$(bindir)/gforth -e "s\" $(DESTDIR)$(libccdir)\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done
                 $(POST_INSTALL)                  $(POST_INSTALL)
                 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info                  $(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
Line 622  install-strip: install Line 629  install-strip: install
   
 installdirs:    mkinstalldirs  installdirs:    mkinstalldirs
                 $(NORMAL_INSTALL)                  $(NORMAL_INSTALL)
                 for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION); do \                  for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \
                         $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \                          $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
                 done                  done
                 for i in $(CVSDIRS); do \                  for i in $(CVSDIRS); do \
Line 637  uninstall: FORCE Line 644  uninstall: FORCE
                 -$(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)                  -$(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"                  @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  check-libcc-named: $(LIBCC_SRC)
                   $(RMTREE) lib/gforth/$(VERSION)/libcc-named/
                   $(srcdir)/mkinstalldirs lib/gforth/$(VERSION)/libcc-named/
                   for i in $(LIBCC_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path" $$i -e bye; done
   
   check:          gforths gforth.fi 
                 $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-itc" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth-ditc" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast --no-dynamic" >/dev/null 2>&1
                 $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1                  $(MAKE) checkone check-nofast ENGINE="./gforth" >/dev/null 2>&1
                 $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1                  $(MAKE) checkone ENGINE="./gforth-fast" >/dev/null 2>&1
                   $(MAKE) check-libcc-named
                 @echo "*** Check successful ***"                  @echo "*** Check successful ***"
                 ./gforth-fast --diag -e bye                  ./gforth-fast --diag -e bye
   
Line 752  kernl64l$(EC).fi: $(KERNLS) Line 765  kernl64l$(EC).fi: $(KERNLS)
 #               -$(CP) $< $@  #               -$(CP) $< $@
   
 gforth.fi:      $(kernel_fi) gforthmi gforth-ditc$(EC)$(EXE) $(GFORTH_FI_SRC) comp-i.fs  gforth.fi:      $(kernel_fi) gforthmi 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)" includedir=`pwd`/include bindir=`pwd` ./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` libccdir=`pwd`/lib/gforth/$(VERSION)/libcc-named/ ./gforthmi gforth.fi $(FORTHSIZES) $(FORTHKFLAGS) $(STARTUP)
   
 # ------------- Make c-engine  # ------------- Make c-engine
   
Line 765  prim-fast.b: prim cache-fast$(STACK_CACH Line 778  prim-fast.b: prim cache-fast$(STACK_CACH
                 sleep 1 #should make hpux-workaround unnecessary                  sleep 1 #should make hpux-workaround unnecessary
   
 $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs  $(FORTH_GEN_ENGINE_FAST): prim-fast.b prims2x.fs
                 GFORTH="$(FORTHP)" $(srcdir)/gfgen -fast                  GFORTH="$(PREFORTH)" $(srcdir)/gfgen -fast
   
 $(FORTH_GEN_ENGINE): prim.b prims2x.fs  $(FORTH_GEN_ENGINE): prim.b prims2x.fs
                 GFORTH="$(PREFORTH)" $(srcdir)/gfgen                  GFORTH="$(PREFORTH)" $(srcdir)/gfgen
Line 793  MAKELINE-noll-reg = OPT=-noll-reg OPTDEF Line 806  MAKELINE-noll-reg = OPT=-noll-reg OPTDEF
 MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=  MAKELINE-ll       = OPT=-ll OPTDEFINES=-DFORCE_LL OPTOBJECTS=
 MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o  MAKELINE-noll     = OPT=-noll OPTDEFINES= OPTOBJECTS=dblsub.o
   
 gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h  gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h $(kernel_fi)
         if test -z "$(OPT)"; then \          if test -z "$(OPT)"; then \
                 for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \                  for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \
         else \          else \
Line 849  gforths: $(ENGINES) $(ENGINES_FAST) Line 862  gforths: $(ENGINES) $(ENGINES_FAST)
                 $(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@                  $(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@
   
 %.so:           %.c  %.so:           %.c
                 $(GCC) -shared $(CFLAGS) $< -o $@                  $(GCC) -shared $(CFLAGS) $(CPPFLAGS) $< -o $@
   
 # ------------- Make Documentation  # ------------- Make Documentation
   
Line 982  engine/config.h: stamp-h Line 995  engine/config.h: stamp-h
 stamp-h: engine/config.h.in config.status stamp-h.in  stamp-h: engine/config.h.in config.status stamp-h.in
         ./config.status          ./config.status
   
 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  Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in
         ./config.status          ./config.status
   
 config.status: configure  config.status: configure
Line 997  makefile.os2 engine/makefile.os2: mkos2m Line 1010  makefile.os2 engine/makefile.os2: mkos2m
         sed -f mkos2mf.sed <Makefile.in >makefile.os2          sed -f mkos2mf.sed <Makefile.in >makefile.os2
         sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2          sed -f mkos2mf.sed <engine/Makefile.in >engine/makefile.os2
         echo '%.o:      %.c' >>makefile.os2          echo '%.o:      %.c' >>makefile.os2
         echo '          $$(GCC) $$(CFLAGS) -c $$<' >>makefile.os2          echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2
         echo '%.o:      %.c' >>engine/makefile.os2          echo '%.o:      %.c' >>engine/makefile.os2
         echo '          $$(GCC) $$(CFLAGS) -c $$<' >>engine/makefile.os2          echo '          $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2

Removed from v.1.393  
changed lines
  Added in v.1.407


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