summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2015-06-16 18:18:11 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2015-06-23 12:07:41 +0100
commit7e87f1ea1e8cc664c4071e8c10ab665f5bbcec7f (patch)
treeb58c110ca000cfc566fc85a65f34eaaa007662ae
parent8d720d6ac7e8a9c5ff0be2316f1f7af8a930139f (diff)
downloadcygnal-7e87f1ea1e8cc664c4071e8c10ab665f5bbcec7f.tar.gz
cygnal-7e87f1ea1e8cc664c4071e8c10ab665f5bbcec7f.tar.bz2
cygnal-7e87f1ea1e8cc664c4071e8c10ab665f5bbcec7f.zip
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>
-rw-r--r--winsup/doc/ChangeLog4
-rw-r--r--winsup/doc/Makefile.in6
2 files changed, 6 insertions, 4 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index ca3bac6bd..77985b81f 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 e2155806f..7cdc72c7d 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}/$@"