diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 4c2c209f83..80bfc1c1f6 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -16,7 +16,3 @@ CSS=base.css
EXTRA_DIST = $(XML) $(FIGS) $(CSS) magic-png magic-pdf
include $(srcdir)/../manuals.mak
-
-check:
- xmllint -noout -valid $(MAIN)
-
diff --git a/docs/manual/advanced-autoplugging.xml b/docs/manual/advanced-autoplugging.xml
index 635c46b931..91b1298c7a 100644
--- a/docs/manual/advanced-autoplugging.xml
+++ b/docs/manual/advanced-autoplugging.xml
@@ -89,7 +89,7 @@
The Hello world pipeline with MIME types
-
+
diff --git a/docs/manual/advanced-threads.xml b/docs/manual/advanced-threads.xml
index 38e0de5723..4b8082afbc 100644
--- a/docs/manual/advanced-threads.xml
+++ b/docs/manual/advanced-threads.xml
@@ -69,7 +69,7 @@
A thread
-
+
diff --git a/docs/manual/basics-bins.xml b/docs/manual/basics-bins.xml
index 478f766cbb..731d7cdc6e 100644
--- a/docs/manual/basics-bins.xml
+++ b/docs/manual/basics-bins.xml
@@ -20,7 +20,7 @@
Visualisation of a <classname>GstBin</classname> element with some elements in it
-
+
@@ -187,7 +187,7 @@
Visualisation of a <classname>GstBin</classname> element without ghost pads
-
+
@@ -202,7 +202,7 @@
Visualisation of a <classname>GstBin</classname> element with a ghost pad
-
+
diff --git a/docs/manual/basics-elements.xml b/docs/manual/basics-elements.xml
index d301bead65..b80d3860cd 100644
--- a/docs/manual/basics-elements.xml
+++ b/docs/manual/basics-elements.xml
@@ -34,7 +34,7 @@
Visualisation of a source element
-
+
@@ -62,7 +62,7 @@
Visualisation of a filter element
-
+
@@ -77,7 +77,7 @@
+ format="&MAGIC;" />
@@ -102,7 +102,7 @@
Visualisation of a sink element
-
+
diff --git a/docs/manual/basics-helloworld.xml b/docs/manual/basics-helloworld.xml
index 34531fa529..5cb9f2a43d 100644
--- a/docs/manual/basics-helloworld.xml
+++ b/docs/manual/basics-helloworld.xml
@@ -181,7 +181,7 @@ main (int argc, char *argv[])
The Hello world pipeline
-
+
diff --git a/docs/manual/bins.xml b/docs/manual/bins.xml
index 478f766cbb..731d7cdc6e 100644
--- a/docs/manual/bins.xml
+++ b/docs/manual/bins.xml
@@ -20,7 +20,7 @@
Visualisation of a <classname>GstBin</classname> element with some elements in it
-
+
@@ -187,7 +187,7 @@
Visualisation of a <classname>GstBin</classname> element without ghost pads
-
+
@@ -202,7 +202,7 @@
Visualisation of a <classname>GstBin</classname> element with a ghost pad
-
+
diff --git a/docs/manual/connections.xml b/docs/manual/connections.xml
index 68eaa8135f..d579c932c0 100644
--- a/docs/manual/connections.xml
+++ b/docs/manual/connections.xml
@@ -9,7 +9,7 @@
Visualisation of three connected elements
-
+
diff --git a/docs/manual/elements.xml b/docs/manual/elements.xml
index d301bead65..b80d3860cd 100644
--- a/docs/manual/elements.xml
+++ b/docs/manual/elements.xml
@@ -34,7 +34,7 @@
Visualisation of a source element
-
+
@@ -62,7 +62,7 @@
Visualisation of a filter element
-
+
@@ -77,7 +77,7 @@
+ format="&MAGIC;" />
@@ -102,7 +102,7 @@
Visualisation of a sink element
-
+
diff --git a/docs/manual/factories.xml b/docs/manual/factories.xml
index 635c46b931..91b1298c7a 100644
--- a/docs/manual/factories.xml
+++ b/docs/manual/factories.xml
@@ -89,7 +89,7 @@
The Hello world pipeline with MIME types
-
+
diff --git a/docs/manual/helloworld.xml b/docs/manual/helloworld.xml
index 34531fa529..5cb9f2a43d 100644
--- a/docs/manual/helloworld.xml
+++ b/docs/manual/helloworld.xml
@@ -181,7 +181,7 @@ main (int argc, char *argv[])
The Hello world pipeline
-
+
diff --git a/docs/manual/magic-pdf b/docs/manual/magic-pdf
index abc274e270..34af8f3dfa 100644
--- a/docs/manual/magic-pdf
+++ b/docs/manual/magic-pdf
@@ -1 +1,2 @@
+
diff --git a/docs/manual/magic-png b/docs/manual/magic-png
index 6941e28950..01cc2484a3 100644
--- a/docs/manual/magic-png
+++ b/docs/manual/magic-png
@@ -1 +1,2 @@
+
diff --git a/docs/manual/queues.xml b/docs/manual/queues.xml
index 57654fa09b..bbfcefcf1e 100644
--- a/docs/manual/queues.xml
+++ b/docs/manual/queues.xml
@@ -26,7 +26,7 @@
a two-threaded decoder with a queue
-
+
diff --git a/docs/manual/threads.xml b/docs/manual/threads.xml
index 38e0de5723..4b8082afbc 100644
--- a/docs/manual/threads.xml
+++ b/docs/manual/threads.xml
@@ -69,7 +69,7 @@
A thread
-
+
diff --git a/docs/manuals.mak b/docs/manuals.mak
index 92263b7ff6..70df1e06fd 100644
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -2,9 +2,13 @@
# taken from selfdocbookx, http://cyberelk.net/tim/docbook/selfdocbookx/index.html
# modified by andy wingo 14 dec 2001 for use by gstreamer
+# and a little bit by thomas as well
all: html ps pdf
+check:
+ xmllint -noout -valid $(MAIN)
+
if HAVE_XSLTPROC
if HAVE_FIG2DEV_PNG
@@ -39,17 +43,25 @@ ps:
pdf:
endif #!HAVE_XSLTPROC
-$(DOC).fo: $(XML) $(PDFS) $(XSLFO) $(XSLFOMODS)
- cp magic-pdf magic
- xsltproc $(XSLFO) $(MAIN) > $@-t
- mv -f $@-t $@
+#$(DOC).fo: $(XML) $(PDFS) $(XSLFO) $(XSLFOMODS)
+# cp magic-pdf magic
+# xsltproc $(XSLFO) $(MAIN) > $@-t
+# mv -f $@-t $@
+#
+#$(DOC).pdf: $(DOC).fo
+# pdfxmltex $< || true
+# pdfxmltex $< || true
+#
+#$(DOC).ps: $(DOC).pdf
+# pdftops $< $@
-$(DOC).pdf: $(DOC).fo
- pdfxmltex $< || true
- pdfxmltex $< || true
+# thomasvs: use db2 because it seems a lot better
+# this ought to be checked for in configure, and the old stuff removed
+$(DOC).pdf: $(DOC).xml
+ db2pdf $(DOC).xml
-$(DOC).ps: $(DOC).pdf
- pdftops $< $@
+$(DOC).ps: $(DOC).xml
+ db2ps $(DOC).xml
$(DOC): $(XML) $(PNGS) $(XSLHTML) $(XSLHTMLMODS)
-$(RM) *.html