diff options
| -rw-r--r-- | .hgignore | 13 | ||||
| -rw-r--r-- | staging-specs/Makefile | 28 | ||||
| -rw-r--r-- | staging-specs/media.xml | 4 | ||||
| -rw-r--r-- | staging-specs/v4l/v4l2.xml | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 5 |
5 files changed, 29 insertions, 23 deletions
@@ -104,16 +104,15 @@ dvb-spec/sgml/pdf-build.stamp$ staging-specs/media/ staging-specs/media-single/ staging-specs/capture -staging-specs/capture.c.xml -staging-specs/entities.xml +staging-specs/media-entities.xml +staging-specs/media-indices.xml staging-specs/html-build.stamp staging-specs/html-single-build.stamp -staging-specs/indices.xml -staging-specs/keytable.c.xml staging-specs/media.aux staging-specs/media.log staging-specs/media.out staging-specs/media.pdf -staging-specs/v4l2grab.c.xml -staging-specs/videodev2.h.xml - +staging-specs/v4l/v4l2grab.c.xml +staging-specs/v4l/videodev2.h.xml +staging-specs/v4l/capture.c.xml +staging-specs/v4l/keytable.c.xml diff --git a/staging-specs/Makefile b/staging-specs/Makefile index c79666ece..09fce72e9 100644 --- a/staging-specs/Makefile +++ b/staging-specs/Makefile @@ -90,10 +90,10 @@ V4L_SGMLS = \ v4l/vidioc-reqbufs.xml \ v4l/vidioc-s-hw-freq-seek.xml \ v4l/vidioc-streamon.xml \ - capture.c.xml \ - keytable.c.xml \ - v4l2grab.c.xml \ - videodev2.h.xml \ + v4l/capture.c.xml \ + v4l/keytable.c.xml \ + v4l/v4l2grab.c.xml \ + v4l/videodev2.h.xml \ v4l/v4l2.xml V4L_PDFPICS = \ @@ -132,7 +132,7 @@ DVB_GIFPICS = \ dvb/dvbstb.png -SGMLS = $(V4L_SGMLS) $(DVB_SGMLS) media.xml entities.xml indices.xml +SGMLS = $(V4L_SGMLS) $(DVB_SGMLS) media.xml media-entities.xml media-indices.xml PDFPICS = $(V4L_PDFPICS) $(DVB_PDFPICS) @@ -152,6 +152,8 @@ CUSTOM_PRINT_XMLTO = -m custom.xsl all: capture html-single +prep: Makefile checks $(SGMLS) $(GIFPICS) + html: html-build.stamp html-single: html-single-build.stamp @@ -362,34 +364,34 @@ DOCUMENTED = \ -e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta" \ -e "s/(linkend=\")v4l2-mpeg-vbi-ITV0/\1)v4l2_mpeg_vbi_itv0-1/g" -libv4l-fmt.xml: +v4l/libv4l-fmt.xml: cat ../v4l2-apps/libv4l/libv4lconvert/*.c| \ perl -ne 'if (m/(V4L2_PIX_FMT_[^\s\;\\)\,:]+)/) { printf "<link linkend=\"$$1\"><constant>$$1</constant></link>,\n"; };' \ |sort|uniq| \ sed -e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta" > $@ -capture.c.xml: ../v4l2-apps/test/capture-example.c Makefile +v4l/capture.c.xml: ../v4l2-apps/test/capture-example.c Makefile echo "<programlisting>" > $@ expand --tabs=8 < $< | \ sed $(ESCAPE) $(DOCUMENTED) | \ sed 's/i\.e\./&ie;/' >> $@ echo "</programlisting>" >> $@ -v4l2grab.c.xml: ../v4l2-apps/test/v4l2grab.c Makefile +v4l/v4l2grab.c.xml: ../v4l2-apps/test/v4l2grab.c Makefile echo "<programlisting>" > $@ expand --tabs=8 < $< | \ sed $(ESCAPE) $(DOCUMENTED) | \ sed 's/i\.e\./&ie;/' >> $@ echo "</programlisting>" >> $@ -keytable.c.xml: ../v4l2-apps/util/keytable.c Makefile +v4l/keytable.c.xml: ../v4l2-apps/util/keytable.c Makefile echo "<programlisting>" > $@ expand --tabs=8 < $< | \ sed $(ESCAPE) $(DOCUMENTED) | \ sed 's/i\.e\./&ie;/' >> $@ echo "</programlisting>" >> $@ -videodev2.h.xml: ../linux/include/linux/videodev2.h Makefile +v4l/videodev2.h.xml: ../linux/include/linux/videodev2.h Makefile echo "<programlisting>" > $@ expand --tabs=8 < $< | \ sed $(ESCAPE) $(DOCUMENTED) | \ @@ -420,7 +422,7 @@ checks: # We're generating these entities to avoid typos, to enforce consistent # naming, an to be warned about missing items (Jade screams bloody murder # if references are dangling). -entities.xml: Makefile +media-entities.xml: Makefile echo "<!-- Generated file! Do not edit. -->" >$@ echo -e "\n<!-- Functions -->" >>$@ for ident in $(FUNCS) ; do \ @@ -479,7 +481,7 @@ entities.xml: Makefile # Jade can auto-generate a list-of-tables, which includes all structs, # but we only want data types, all types, and sorted please. -indices.xml: Makefile +media-indices.xml: Makefile echo "<!-- Generated file! Do not edit. -->" >$@ echo -e "\n<index><title>List of Types</title>" >>$@ for ident in $(TYPES) ; do \ @@ -568,5 +570,5 @@ distclean clean: rm -f keytable.c.xml rm -f media.aux media.log media.out rm -f capture - rm -f indices.xml entities.xml + rm -f media-indices.xml media-entities.xml rm -rf media media-single media.pdf diff --git a/staging-specs/media.xml b/staging-specs/media.xml index 28a37f802..e8f260e1c 100644 --- a/staging-specs/media.xml +++ b/staging-specs/media.xml @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY % entities SYSTEM "./entities.xml"> %entities; -<!ENTITY indices SYSTEM "./indices.sgml"> +<!ENTITY % media-entities SYSTEM "./media-entities.xml"> %media-entities; +<!ENTITY media-indices SYSTEM "./media-indices.sgml"> <!ENTITY eg "e. g."> <!ENTITY ie "i. e."> diff --git a/staging-specs/v4l/v4l2.xml b/staging-specs/v4l/v4l2.xml index 4e6776854..cde691231 100644 --- a/staging-specs/v4l/v4l2.xml +++ b/staging-specs/v4l/v4l2.xml @@ -149,7 +149,7 @@ with any V4L2 driver.</para> &sub-fdl-appendix; - &sub-indices; + &sub-media-indices; &sub-biblio; diff --git a/v4l/Makefile b/v4l/Makefile index 76d0bdd80..5f9e2f193 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -68,6 +68,11 @@ spec:: v4l2-spec dvb-spec apps:: $(MAKE) -C ../v4l2-apps +docbooks:: + $(MAKE) -C ../staging-specs prep + mkdir -p ../linux/Documentation/Docbook + cp -r ../staging-specs/*.xml ../staging-specs/dvb/ ../staging-specs/v4l ../linux/Documentation/Docbook + ################################################# # Object specific rules |