texinfo update (Thu Oct 28 10:22:01 EDT 2004)

[Karl Berry]

Index: info/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** info/Makefile.am    20 Oct 2004 17:47:11 -0000      1.7
--- info/Makefile.am    28 Oct 2004 14:03:27 -0000      1.8
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.7 2004/10/20 17:47:11 karl Exp $
  # Makefile.am for texinfo/info.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.8 2004/10/28 14:03:27 karl Exp $
  # Makefile.am for texinfo/info.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 10,17 ****
  # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  
- noinst_PROGRAMS = makedoc
- 
  # Use `ginfo' for building to avoid confusion with the standard `info'
  # target.  Removes the `g' in the install rule before applying any
  # user-specified name transformations.
--- 10,15 ----
***************
*** 29,48 ****
        -DINFODIR2=\"$(infodir2)\"
  LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL)
  
- # The files `doc.c', `key.c' and `funs.h' are created by ./makedoc run over 
the
- # source files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
- # listing the functions found.  `doc.c' is a structure containing pointers
- # to those functions along with completable names and documentation strings.
- 
- generated_sources = doc.c key.c funs.h
- 
- # The following hack is necessary to hint make before the automatic
- # dependencies are built.
- BUILT_SOURCES = funs.h
- 
  EXTRA_DIST = README pcterm.c
  
- makedoc_SOURCES = makedoc.c
  ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \
    echo-area.c echo-area.h \
    filesys.c filesys.h footnotes.c footnotes.h gc.c gc.h \
--- 27,34 ----
***************
*** 55,60 ****
--- 41,64 ----
  infokey_SOURCES = infokey.c infokey.h key.h
  nodist_infokey_SOURCES = key.c funs.h
  
+ # The files `doc.c', `key.c' and `funs.h' are created by ./makedoc run over 
the
+ # source files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
+ # listing the functions found.  `doc.c' is a structure containing pointers
+ # to those functions along with completable names and documentation strings.
+ #
+ generated_sources = doc.c key.c funs.h
+ 
+ # We need a linear ordering to prevent race condition in parallel make.
+ # See the node ``(automake)Multiple Outputs'' for an explanation.
+ doc.c: key.c
+ key.c: funs.h
+ 
+ # These files are not distributed.
+ DISTCLEANFILES = $(generated_sources)
+ 
+ noinst_PROGRAMS = makedoc
+ makedoc_SOURCES = makedoc.c
+ 
  # Files with Info commands defined that makedoc should read.
  cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
    $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
***************
*** 65,69 ****
        rm -f $(generated_sources)
        $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
  
! # These files are not distributed.
! DISTCLEANFILES = $(generated_sources)
--- 69,74 ----
        rm -f $(generated_sources)
        $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
  
! # The following hack is necessary to hint make before the automatic
! # dependencies are built.
! BUILT_SOURCES = funs.h
P info/Makefile.am