DocBook: rename main DocBook to media-specs and fix build rules

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Priority: normal

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

8 files changed, 46 insertions, 40 deletions

diff --git a/.hgignore b/.hgignore
index 7963d6e6f..29338520b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -94,31 +94,30 @@ dvb-spec/dvbapi/dvbapi.ps
 dvb-spec/dvbapi/dvbapi.toc
 dvb-spec/dvbapi/dvbstb.ps
 dvb-spec/dvbapi/dvbstb.pst
-dvb-spec/sgml/dvbapi/
-dvb-spec/sgml/dvbapi-single/
-dvb-spec/sgml/dvbapi.pdf$
-dvb-spec/sgml/entities.sgml$
-dvb-spec/sgml/html-build.stamp$
-dvb-spec/sgml/html-single-build.stamp$
-dvb-spec/sgml/pdf-build.stamp$
-staging-specs/media/
-staging-specs/media-single/
-staging-specs/capture
-staging-specs/media-entities.xml
-staging-specs/media-indices.xml
-staging-specs/html-build.stamp
-staging-specs/html-single-build.stamp
-staging-specs/media.aux
-staging-specs/media.log
-staging-specs/media.out
-staging-specs/media.pdf
-staging-specs/v4l/v4l2grab.c.xml
-staging-specs/v4l/videodev2.h.xml
-staging-specs/v4l/capture.c.xml
-staging-specs/v4l/keytable.c.xml
-linux/Documentation/Docbook/.*\.xml
-linux/Documentation/Docbook/.*\.gif
-linux/Documentation/Docbook/.*\.png
-linux/Documentation/Docbook/.*\.pdf
+dvb-spec/dvbapi/dvbapi/
+dvb-spec/dvbapi/dvbapi-single/
+dvb-spec/dvbapi/dvbapi.pdf$
+dvb-spec/dvbapi/entities.sgml$
+dvb-spec/dvbapi/html-build.stamp$
+dvb-spec/dvbapi/html-single-build.stamp$
+dvb-spec/dvbapi/pdf-build.stamp$
+media-specs/media/
+media-specs/media-single/
+media-specs/capture
+media-specs/media-entities.xml
+media-specs/media-indices.xml
+media-specs/html-build.stamp
+media-specs/html-single-build.stamp
+media-specs/media.aux
+media-specs/media.log
+media-specs/media.out
+media-specs/media.pdf
+media-specs/v4l/v4l2grab.c.xml
+media-specs/v4l/videodev2.h.xml
+media-specs/v4l/capture.c.xml
+media-specs/v4l/keytable.c.xml
+media-specs/dvb$
+media-specs/media.xml$
+media-specs/v4l$
 
 
diff --git a/Makefile b/Makefile
index 1cdd3abed..1760d6f8d 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ install:
 	$(MAKE) -C $(BUILD_DIR) install
 
 # Hmm, .PHONY does not work with wildcard rules :-(
-SPECS = v4l2-spec dvb-spec
+SPECS = media-specs
 
 .PHONY: $(SPECS)
 
diff --git a/staging-specs/Makefile b/media-specs/Makefile
index 198e077c8..ef30fc9ed 100644
--- a/staging-specs/Makefile
+++ b/media-specs/Makefile
@@ -131,7 +131,7 @@ DVB_GIFPICS = \
 	dvb/dvbstb.png
 
 
-SGMLS = $(V4L_SGMLS) $(DVB_SGMLS) media.xml media-entities.xml media-indices.xml
+SGMLS = $(V4L_SGMLS) $(DVB_SGMLS) media.xml media-entities.tmpl media-indices.tmpl
 
 PDFPICS = $(V4L_PDFPICS) $(DVB_PDFPICS)
 
@@ -355,6 +355,15 @@ ESCAPE = \
 	-e "s/</\\&lt;/g" \
 	-e "s/>/\\&gt;/g"
 
+FILENAME = \
+	-e s,"^[^\/]*/",, \
+	-e s/"\\.xml"// \
+	-e s/"\\.tmpl"// \
+	-e s/\\\./-/g \
+	-e s/"^func-"// \
+	-e s/"^pixfmt-"// \
+	-e s/"^vidioc-"//
+
 # Generate references to these structs in videodev2.h.xml.
 DOCUMENTED = \
 	-e "s/\(enum *\)v4l2_mpeg_cx2341x_video_\([a-z]*_spatial_filter_type\)/\1<link linkend=\"\2\">v4l2_mpeg_cx2341x_video_\2<\/link>/g" \
@@ -433,7 +442,7 @@ checks: $(SGMLS)
 # 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).
-media-entities.xml: Makefile $(SGMLS)
+media-entities.tmpl: Makefile $(SGMLS)
 	echo "<!-- Generated file! Do not edit. -->" >$@
 	echo -e "\n<!-- Functions -->" >>$@
 	for ident in $(FUNCS) ; do \
@@ -475,7 +484,7 @@ media-entities.xml: Makefile $(SGMLS)
 	done
 	echo -e "\n<!-- Subsections -->" >>$@
 	for file in $(SGMLS) ; do \
-	  entity=`echo "$$file" | sed -r s,".*/",, | sed 's/.xml//;s/\./-/g'` ; \
+	  entity=`echo "$$file" | sed $(FILENAME) -e s/"^([^-]*)"/sub\1/` ; \
 	  if ! echo "$$file" | \
 	    grep -q -E -e '^(func|vidioc|pixfmt)-' ; then \
 	    echo "<!ENTITY sub-$$entity SYSTEM \"$$file\">" >>$@ ; \
@@ -485,14 +494,14 @@ media-entities.xml: Makefile $(SGMLS)
 	for file in $(SGMLS) ; do \
 	  if echo "$$file" | \
 	    grep -q -E -e '(func|vidioc|pixfmt)-' ; then \
-	    entity=`echo "$$file" |sed -r s,".*/",, | sed 's/^[^-]*/sub/;s/.xml//'` ; \
+	    entity=`echo "$$file" |sed $(FILENAME)` ; \
 	    echo "<!ENTITY $$entity SYSTEM \"$$file\">" >>$@ ; \
 	  fi ; \
 	done
 
 # Jade can auto-generate a list-of-tables, which includes all structs,
 # but we only want data types, all types, and sorted please.
-media-indices.xml: Makefile $(SGMLS)
+media-indices.tmpl: Makefile $(SGMLS)
 	echo "<!-- Generated file! Do not edit. -->" >$@
 	echo -e "\n<index><title>List of Types</title>" >>$@
 	for ident in $(TYPES) ; do \
@@ -581,6 +590,6 @@ distclean clean:
 	rm -f keytable.c.xml
 	rm -f media.aux media.log media.out
 	rm -f capture
-	rm -f media-indices.xml media-entities.xml
+	rm -f media-indices.tmpl media-entities.tmpl
 	rm -rf media media-single media.pdf
 	rm -rf media.xml v4l dvb
diff --git a/staging-specs/README b/media-specs/README
index 160826890..160826890 100644
--- a/staging-specs/README
+++ b/media-specs/README
diff --git a/staging-specs/custom.dsl b/media-specs/custom.dsl
index 12a5e91d4..12a5e91d4 100644
--- a/staging-specs/custom.dsl
+++ b/media-specs/custom.dsl
diff --git a/staging-specs/custom.xsl b/media-specs/custom.xsl
index e1556c37c..e1556c37c 100644
--- a/staging-specs/custom.xsl
+++ b/media-specs/custom.xsl
diff --git a/staging-specs/xml.dcl b/media-specs/xml.dcl
index 59a97922f..59a97922f 100644
--- a/staging-specs/xml.dcl
+++ b/media-specs/xml.dcl
diff --git a/v4l/Makefile b/v4l/Makefile
index 42618efa6..6fe949f27 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -58,21 +58,19 @@ v4l2-spec::
 	$(MAKE) -C ../v4l2-spec
 
 man::
-	$(MAKE) -C ../v4l2-spec man
+	$(MAKE) -C ../media-specs man
 
 dvb-spec::
 	$(MAKE) -C ../dvb-spec/dvbapi
 
-spec:: v4l2-spec dvb-spec
+media-spec::
+	$(MAKE) -C ../media-specs
+
+spec:: media-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