Diff for /gforth/Makefile.in between versions 1.476 and 1.492

version 1.476, 2012/06/21 23:28:00 version 1.492, 2012/12/31 15:25:17
Line 1 Line 1
 #Makefile for Gforth  #Makefile for Gforth
   
 #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.  #Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012 Free Software Foundation, Inc.
   
 #This file is part of Gforth.  #This file is part of Gforth.
   
Line 48  PATHSEP = @PATHSEP@ Line 48  PATHSEP = @PATHSEP@
 EC = @EC@  EC = @EC@
 ARCH= @ARCH@  ARCH= @ARCH@
 EXT = $(EC)$(ARCH)$(EXE)  EXT = $(EC)$(ARCH)$(EXE)
   LA = $(EC)$(ARCH).la
   
 # ------------  Install Directories  # ------------  Install Directories
   
Line 88  MASSAGE_EXE = @MASSAGE_EXE@ Line 89  MASSAGE_EXE = @MASSAGE_EXE@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@  INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@  INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@  INSTALL_INFO = @INSTALL_INFO@
 LN_S    = @LN_S@  LN_S    = @LN_S@ -f
 M4      = @M4@  M4      = @M4@
 GCC     = @CC@  GCC     = @CC@
 EMACS   = @EMACS@  EMACS   = @EMACS@
Line 237  GFORTH_FI_SRC2=\ Line 238  GFORTH_FI_SRC2=\
         hash.fs \          hash.fs \
         history.fs \          history.fs \
         intcomp.fs \          intcomp.fs \
           i18n.fs \
         mkdir.fs \          mkdir.fs \
         libcc.fs \          libcc.fs \
         locals.fs \          locals.fs \
Line 244  GFORTH_FI_SRC2=\ Line 246  GFORTH_FI_SRC2=\
         mkdir.fs \          mkdir.fs \
         prelude.fs \          prelude.fs \
         quotes.fs \          quotes.fs \
           quotedstring.fs \
           parsedto.fs \
         search.fs \          search.fs \
         see.fs \          see.fs \
         see-ext.fs \          see-ext.fs \
Line 254  GFORTH_FI_SRC2=\ Line 258  GFORTH_FI_SRC2=\
         struct.fs \          struct.fs \
         struct0x.fs \          struct0x.fs \
         stuff.fs \          stuff.fs \
           substitute.fs \
         tasker.fs \          tasker.fs \
         termsize.fs \          termsize.fs \
         utf-8.fs \          utf-8.fs \
Line 292  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST Line 297  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST
         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 \
         envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.fs \          envos.dos envos.os2 etags.fs fft.fs filedump.fs fi2c.fs \
         fsl-util.4th glosgen.fs gray.fs httpd.fs install-tags.fs \          fsl-util.4th fsl-util.fs glosgen.fs gray.fs httpd.fs install-tags.fs \
         make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs \          make-app.fs doc/makedoc.fs locate.fs more.fs onebench.fs fft-bench.fs \
         other.fs prims2x.fs prims2x0.6.2.fs proxy.fs random.fs \          other.fs prims2x.fs prims2x0.6.2.fs proxy.fs random.fs \
         regexp.fs sokoban.fs string.fs table.fs tags.fs \          regexp.fs sokoban.fs string.fs table.fs tags.fs \
         tt.fs quotations.fs \          tt.fs quotations.fs \
Line 309  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST Line 314  FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_DIST
         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 sieve.fs \          add.fs lib.fs oldlib.fs sieve.fs \
         endtry-iferror.fs recover-endtry.fs          endtry-iferror.fs recover-endtry.fs smartdots.fs \
           unix/terminal-server.fs
   
 COMPAT = compat/README \  COMPAT = compat/README \
         compat/anslocal.fs \          compat/anslocal.fs \
Line 412  ARCHS_NO_DIST = \ Line 418  ARCHS_NO_DIST = \
         arch/h8/asm.fs \          arch/h8/asm.fs \
         arch/r8c/tt.fs          arch/r8c/tt.fs
   
   # temporary change.  DO NOT COMMIT
   ARCHS += $(ARCHS_NO_DIST)
   
 VMGEN_EX = vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \  VMGEN_EX = vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \
         vmgen-ex/engine.c vmgen-ex/fib.mini \          vmgen-ex/engine.c vmgen-ex/fib.mini \
         vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \          vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \
Line 525  version: Makefile.in configure.in Line 534  version: Makefile.in configure.in
 kernel/version.fs:      version  kernel/version.fs:      version
         echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs          echo ": version-string s\" $(VERSION)\" ;" > kernel/version.fs
   
 more:   $(ENGINES) $(FORTH_GEN) $(GEN) @build_libcc_named@  more:   $(ENGINES) $(FORTH_GEN) $(GEN) @libengines@ @build_libcc_named@
   
 #from the gcc Makefile:   #from the gcc Makefile: 
 #"Deletion of files made during compilation.  #"Deletion of files made during compilation.
Line 557  docclean: FORCE Line 566  docclean: FORCE
                 doc/gforth.toc doc/gforth.tp doc/gforth.vr html                  doc/gforth.toc doc/gforth.tp doc/gforth.vr html
   
 clean:          mostlyclean  clean:          mostlyclean
         -$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \          -$(RM) -rf $(GEN) *.o engine/*.o engine/*.lo engine/*.la \
           engine/.libs engine/libgforth* libgforth* arch/*/*.o version \
         gforth-itc-noll$(EXT)  engine/gforth-itc-noll$(EXT)  \          gforth-itc-noll$(EXT)  engine/gforth-itc-noll$(EXT)  \
         gforth-ditc-noll$(EXT) engine/gforth-ditc-noll$(EXT) \          gforth-ditc-noll$(EXT) engine/gforth-ditc-noll$(EXT) \
         gforth-prof-noll$(EXT) engine/gforth-prof-noll$(EXT) \          gforth-prof-noll$(EXT) engine/gforth-prof-noll$(EXT) \
Line 613  binonlydist: Makedist FORCE Line 623  binonlydist: Makedist FORCE
 debdist:        Makedist FORCE  debdist:        Makedist FORCE
                 $(MAKE) -f Makedist d$@                  $(MAKE) -f Makedist d$@
   
   setup-debdist:  Makedist FORCE
                   $(MAKE) -f Makedist d$@
   
 #HPUX make breaks the cycle differently when the dates are equal, so  #HPUX make breaks the cycle differently when the dates are equal, so
 # touch some of the files if it acts up  # touch some of the files if it acts up
 hpux-workaround:  hpux-workaround:
Line 626  hpux-workaround: Line 639  hpux-workaround:
 #hard to generate).  #hard to generate).
 #we rebuild gforth.fi, because it contains some path names.  #we rebuild gforth.fi, because it contains some path names.
 #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.  #we delete $build/gforth.fi and $build/install.TAGS after installation because of ownership.
 install:        gforth$(EXT) $(FORTH_SRC) $(kernel_fi) gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs @NO_CROSS@ gforth.fi  install:        gforth$(EXT) $(FORTH_SRC) $(kernel_fi) gforthmi vmgen doc/gforth.1 prim install.TAGS installdirs @libinstall@ @NO_CROSS@ gforth.fi
                 $(NORMAL_INSTALL)                  $(NORMAL_INSTALL)
                 touch $(DESTDIR)$(siteforthdir)/siteinit.fs                  touch $(DESTDIR)$(siteforthdir)/siteinit.fs
                 -$(RM) $(DESTDIR)$(bindir)/gforth$(EXT) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen                  -$(RM) $(DESTDIR)$(bindir)/gforth$(EXT) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EXT) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen
Line 665  install: gforth$(EXT) $(FORTH_SRC) $(ker Line 678  install: gforth$(EXT) $(FORTH_SRC) $(ker
                 @NO_CROSS@$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION)                  @NO_CROSS@$(INSTALL_DATA) gforth.fi $(DESTDIR)$(libdir)/gforth$(ARCH)/$(VERSION)
                 $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS                  $(INSTALL_DATA) install.TAGS $(DESTDIR)$(datadir)/gforth/$(VERSION)/TAGS
                 $(RM) install.TAGS @NO_CROSS@gforth.fi                  $(RM) install.TAGS @NO_CROSS@gforth.fi
                 $(INSTALL_DATA) include/gforth/$(VERSION)/* $(DESTDIR)$(includedir)/gforth/$(VERSION)                  $(INSTALL_DATA) include/gforth$(ARCH)/$(VERSION)/* $(DESTDIR)$(includedir)/gforth$(ARCH)/$(VERSION)
                 if test -n "$(LIBTOOL)"; then for i in $(LIBCC_BUILD_SRC); do \                  if test -n "$(LIBTOOL)"; then for i in $(LIBCC_BUILD_SRC); do \
                    $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth$(ARCH)/$(VERSION)/libcc-named/`basename $$i .fs`.la $(DESTDIR)$(libccdir)`basename $$i .fs`.la; \                     $(LIBTOOL) --silent --mode=install $(INSTALL) lib/gforth$(ARCH)/$(VERSION)/libcc-named/libgf`basename $$i .fs`.la $(DESTDIR)$(libccdir)libgf`basename $$i .fs`.la; \
                 done; fi                  done; fi
                 $(POST_INSTALL)                  $(POST_INSTALL)
                 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info                  $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gforth.info
Line 675  install: gforth$(EXT) $(FORTH_SRC) $(ker Line 688  install: gforth$(EXT) $(FORTH_SRC) $(ker
   
 install-strip:  install  install-strip:  install
   
   libinstall:     $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%)
                   for i in $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%); do \
                      $(LIBTOOL) --silent --mode=install $(INSTALL) engine/$$i.la $(libdir)/$$i.la; \
                   done
   
 installdirs:    mkinstalldirs  installdirs:    mkinstalldirs
                 $(NORMAL_INSTALL)                  $(NORMAL_INSTALL)
                 for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth$(ARCH)/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \                  for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth$(ARCH)/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth$(ARCH)/$(VERSION) $(libccdir); do \
                         $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \                          $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \
                 done                  done
                 #                  #
Line 731  bench:  gforth-fast$(EXT) gforth.fi Line 749  bench:  gforth-fast$(EXT) gforth.fi
                 time $(FORTH_FAST) bubble.fs -e "main bye"                  time $(FORTH_FAST) bubble.fs -e "main bye"
                 time $(FORTH_FAST) matrix.fs -e "main bye"                  time $(FORTH_FAST) matrix.fs -e "main bye"
                 time $(FORTH_FAST) fib.fs -e "main bye"                  time $(FORTH_FAST) fib.fs -e "main bye"
                   time $(FORTH_FAST) fft-bench.fs -e "main bye"
   
 onebench one-bench:  onebench one-bench:
         $(FORTH_FAST) onebench.fs          $(FORTH_FAST) onebench.fs
Line 870  gforth-fast$(OPT)$(EXT): $(ENGINE_SOURCE Line 889  gforth-fast$(OPT)$(EXT): $(ENGINE_SOURCE
         if test -z "$(OPT)"; then \          if test -z "$(OPT)"; then \
                 for i in $(OPTS); do $(MAKE) optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EXT) $@ && break; done; \                  for i in $(OPTS); do $(MAKE) optgforth-fast OPT=$$i && $(CP) gforth-fast$${i}$(EXT) $@ && break; done; \
         else \          else \
                 ( cd engine && $(MAKE) $@ ) && \                  (cd engine && $(MAKE) $@ ) && \
                 $(CP) engine/$@ $@ && \                  $(CP) engine/$@ $@ && \
                 $(MASSAGE_EXE) $@; \                  $(MASSAGE_EXE) $@; \
                 @GFORTHFAST_EXE@; \                  @GFORTHFAST_EXE@; \
Line 901  gforth-prof$(EXT): $(ENGINE_SOURCES) $(F Line 920  gforth-prof$(EXT): $(ENGINE_SOURCES) $(F
   
 gforths: $(ENGINES) $(ENGINES_FAST)  gforths: $(ENGINES) $(ENGINES_FAST)
   
   #For now, we have no way to check if the engines build correctly
   libgforth$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/config.h @kernel_anti_dependence@
           if test -z "$(OPT)"; then \
                   for i in $(OPTS); do $(MAKE) optlibgforth OPT=$$i && $(MAKE) optlibgforth2 OPT=$$i && $(LN_S) engine/$@ $@ && break; done; \
           else \
                   (cd engine && $(MAKE) $@ ); \
                   @NO_CROSS@ $(MAKE) checkone check-nofast ENGINE=./engine/$@; \
           fi
   
   optlibgforth:
           $(MAKE) libgforth$(OPT)$(EXT) $(MAKELINE$(OPT))
   
   optlibgforth2:
           (cd engine && $(MAKE) libgforth$(EXT) $(MAKELINE$(OPT)))
   
   libgforth-fast$(OPT)$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE_FAST) engine/config.h
           if test -z "$(OPT)"; then \
                   for i in $(OPTS); do $(MAKE) optlibgforth-fast OPT=$$i && $(MAKE) optlibgforth-fast2 OPT=$$i && $(LN_S) engine/$@ $@ && break; done; \
           else \
                   (cd engine && $(MAKE) $@ ); \
                   @NO_CROSS@ $(MAKE) checkone ENGINE=./engine/$@; \
           fi
   
   optlibgforth-fast:
           $(MAKE) libgforth-fast$(OPT)$(EXT) $(MAKELINE$(OPT))
   
   optlibgforth-fast2:
           (cd engine && $(MAKE) libgforth-fast$(EXT) $(MAKELINE$(OPT)))
   
   libgforth-itc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                   cd engine && $(MAKE) libgforth-itc$(EXT) $(MAKELINE-noll)
   
   libgforth-ditc$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                   cd engine && $(MAKE) libgforth-ditc$(EXT) $(MAKELINE-noll)
   
   libgforth-prof$(EXT): $(ENGINE_SOURCES) $(FORTH_GEN_ENGINE) engine/Makefile engine/config.h
                   cd engine && $(MAKE) libgforth-prof$(EXT) $(MAKELINE-noll)
   
   libgforths: $(ENGINES:%$(EXT)=lib%) $(ENGINES_FAST:%$(EXT)=lib%)
   
 # ------------- additional C primitives  # ------------- additional C primitives
   
 .SUFFIXES:      .c .pri  .SUFFIXES:      .c .pri
Line 1042  engine/config.h: stamp-h Line 1101  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 preforth machpc.fs doc/version.texi envos.fs build-ec: Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in libforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in  Makefile Makedist engine/Makefile gforthmi vmgen preforth machpc.fs doc/version.texi envos.fs build-ec gforthmi.sh:     Makefile.in Makedist.in engine/Makefile.in gforthmi.in vmgen.in preforth.in libforth.in machpc.fs.in doc/version.texi.in config.status configure.in envos.fs.in build-ec.in engine/libcc.h.in gforthmi.sh.in
         ./config.status          ./config.status
   
 config.status: configure  config.status: configure

Removed from v.1.476  
changed lines
  Added in v.1.492


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