This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] winsup/doc: Use xidepend to generate the source list for FAQ targets as well
- From: Jon TURNEY <jturney at sourceware dot org>
- To: cygwin-cvs at sourceware dot org
- Date: 23 Jun 2015 11:10:19 -0000
- Subject: [newlib-cygwin] winsup/doc: Use xidepend to generate the source list for FAQ targets as well
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7e87f1ea1e8cc664c4071e8c10ab665f5bbcec7f
commit 7e87f1ea1e8cc664c4071e8c10ab665f5bbcec7f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 16 18:18:11 2015 +0100
winsup/doc: Use xidepend to generate the source list for FAQ targets as well
2015-06-22 Jon Turney <jon.turney@dronecode.org.uk>
* Makefile.in (FAQ_SOURCES): Remove and generate with xidepend.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diff:
---
winsup/doc/ChangeLog | 4 ++++
winsup/doc/Makefile.in | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index ca3bac6..77985b8 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,5 +1,9 @@
2015-06-22 Jon Turney <jon.turney@dronecode.org.uk>
+ * Makefile.in (FAQ_SOURCES): Remove and generate with xidepend.
+
+2015-06-22 Jon Turney <jon.turney@dronecode.org.uk>
+
* utils.xml: Remove 'Usage' prefix from synopses.
2015-06-22 Jon Turney <jon.turney@dronecode.org.uk>
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index e215580..7cdc72c 100644
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -35,8 +35,6 @@ DOCBOOK2XTEXI:=docbook2x-texi --xinclude --info --utf8trans-map=charmap
include $(srcdir)/../Makefile.common
-include Makefile.dep
-FAQ_SOURCES:= $(wildcard $(srcdir)/faq*.xml)
-
.SUFFIXES: .html .body
.html.body:
@@ -137,9 +135,9 @@ intro2man.stamp: intro.xml man.xsl
@echo ".so intro.1" >cygwin.1
@touch $@
-faq/faq.html : $(FAQ_SOURCES)
+faq/faq.html : $(faq_SOURCES)
-$(XMLTO) html -o faq -m $(srcdir)/html.xsl $(srcdir)/faq.xml
-sed -i 's;<a name="id[mp][0-9]*"></a>;;g' faq/faq.html
-Makefile.dep: cygwin-ug-net.xml cygwin-api.xml
+Makefile.dep: cygwin-ug-net.xml cygwin-api.xml faq.xml
cd $(srcdir) && ./xidepend $^ > "${CURDIR}/$@"