[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Wed Oct 20 14:22:01 EDT 2004)
From: |
Karl Berry |
Subject: |
texinfo update (Wed Oct 20 14:22:01 EDT 2004) |
Date: |
Wed, 20 Oct 2004 14:22:09 -0400 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.401
retrieving revision 1.402
diff -c -r1.401 -r1.402
*** ChangeLog 19 Oct 2004 11:55:57 -0000 1.401
--- ChangeLog 20 Oct 2004 17:47:11 -0000 1.402
***************
*** 1,3 ****
--- 1,32 ----
+ 2004-10-20 Stepan Kasal <address@hidden>
+
+ * info/Makefile.am (doc.c, key.c, funs.h): Don't distribute them.
+ of these three files.
+ (ginfo_SOURCES, nodist_ginfo_SOURCES): Move files.
+ (infokey_SOURCES, nodist_infokey_SOURCES): Likewise.
+ (DISTCLEANFILES): Include generated_sources.
+
+ 2004-10-20 Stepan Kasal <address@hidden>
+
+ BUILT_SOURCES is a special variable for a hack to supplement
+ the automatic dependency tracking; we need it for funs.h only.
+ See the explanation in the automake manual.
+
+ * info/Makefile.am (BUILT_SOURCES): All occurences replaced by ...
+ (generated_sources): ... this new variable.
+ (BUILT_SOURCES): set to ``funs.h''.
+
+ 2004-10-20 Stepan Kasal <address@hidden>
+
+ * info/Makefile.am (ginfo_SOURCES): replace $(BUILT_SOURCES)
+ with ``doc.c funs.h''; this reflects the true situation.
+ (infokey_SOURCES): Add funs.h.
+
+ 2004-10-20 Stepan Kasal <address@hidden>
+
+ * info/Makefile.am (EXTRA_DIST): No need to mention the generated
+ sources here, they are in ginfo_SOURCES or infokey_SOURCES.
+
2004-10-19 Stepan Kasal <address@hidden>
* configure.ac: When cross compiling, we have to remove
Index: info/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** info/Makefile.am 8 Oct 2004 22:05:51 -0000 1.6
--- info/Makefile.am 20 Oct 2004 17:47:11 -0000 1.7
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.6 2004/10/08 22:05:51 karl Exp $
# Makefile.am for texinfo/info.
# Run automake in .. to produce Makefile.in from this.
#
--- 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.
#
***************
*** 29,44 ****
-DINFODIR2=\"$(infodir2)\"
LDADD = ../lib/libtxi.a $(TERMLIBS) $(LIBINTL)
! # The files `doc.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.
- BUILT_SOURCES = doc.c funs.h key.c
! # We distribute the BUILT_SOURCES even though they get rebuilt by
! # installers, just in case something goes wrong. Then installers have
! # the intended sources there to use or debug with.
! EXTRA_DIST = README pcterm.c $(BUILT_SOURCES)
makedoc_SOURCES = makedoc.c
ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \
--- 29,46 ----
-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 \
***************
*** 48,56 ****
infomap.c infomap.h m-x.c man.c man.h nodemenu.c nodes.c nodes.h \
search.c search.h session.c session.h signals.c signals.h \
termdep.h terminal.c terminal.h tilde.c tilde.h \
! variables.c variables.h window.c window.h \
! $(BUILT_SOURCES)
! infokey_SOURCES = infokey.c infokey.h key.c key.h
# Files with Info commands defined that makedoc should read.
cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
--- 50,59 ----
infomap.c infomap.h m-x.c man.c man.h nodemenu.c nodes.c nodes.h \
search.c search.h session.c session.h signals.c signals.h \
termdep.h terminal.c terminal.h tilde.c tilde.h \
! variables.c variables.h window.c window.h
! nodist_ginfo_SOURCES = doc.c funs.h
! infokey_SOURCES = infokey.c infokey.h key.h
! nodist_infokey_SOURCES = key.c funs.h
# Files with Info commands defined that makedoc should read.
cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
***************
*** 58,63 ****
$(srcdir)/footnotes.c $(srcdir)/variables.c
# The $(EXEEXT) should be added by Automake, but isn't. Fine.
! $(BUILT_SOURCES): makedoc$(EXEEXT) $(cmd_sources)
! rm -f $(BUILT_SOURCES)
$(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
--- 61,69 ----
$(srcdir)/footnotes.c $(srcdir)/variables.c
# The $(EXEEXT) should be added by Automake, but isn't. Fine.
! $(generated_sources): makedoc$(EXEEXT) $(cmd_sources)
! rm -f $(generated_sources)
$(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
+
+ # These files are not distributed.
+ DISTCLEANFILES = $(generated_sources)
P ChangeLog
P info/Makefile.am
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Wed Oct 20 14:22:01 EDT 2004),
Karl Berry <=