and now the fix to make buildbot work

Original commit message from CVS:
and now the fix to make buildbot work

diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am
index 7e72530..3142773 100644 (file)
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -27,12 +27,12 @@ include $(srcdir)/../manuals.mak
 include $(srcdir)/../upload.mak
 
 ### this is standard automake stuff
-                                                                                
+
 # package up all the source
 EXTRA_DIST = $(SRC)
-                                                                                
+
 # install documentation
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC)
 doc_DATA = $(PDF_DAT) $(PS_DAT)
-                                                                                
+
 include $(srcdir)/../htmlinstall.mak

diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml
index 08450b2..32d00bc 100644 (file)
--- a/docs/gst/tmpl/gstxml.sgml
+++ b/docs/gst/tmpl/gstxml.sgml
@@ -110,10 +110,6 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@: 
-@: 
-@:
-
 @gstxml: the object which received the signal.
 @arg1: 
 @arg2: 
@@ -123,7 +119,7 @@ All GstElements can be serialized to an XML presentation and subsequently loaded
 
 </para>
 
-@gstxml: the object which received the signal.
-@arg1: 
-@arg2: 
+@: 
+@: 
+@: 
 

diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index a578d8c..4a577eb 100644 (file)
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -16,6 +16,9 @@ CSS = base.css
 PNG_SRC = 
 FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig))
 
+# extra sources to copy in build directory
+EXTRA_SOURCES = 
+
 ### this is the generic bit and you shouln't need to change this
 
 # get the generic docbuilding Makefile stuff

diff --git a/docs/manuals.mak b/docs/manuals.mak
index 4764eb9..34ca1df 100644 (file)
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -1,8 +1,3 @@
-# rewritten by Thomas to be more simple and working
-
-# SF username
-USERNAME ?= thomasvs
-
 ### These are all generic; we set all the variables we need
 
 # intermediary build path
@@ -27,7 +22,6 @@ PNG_BUILT = $(foreach file, $(PNG), $(BUILDIMAGESDIR)/$(file))
 EPS_BUILT = $(foreach file, $(EPS), $(BUILDIMAGESDIR)/$(file))
 PDF_BUILT = $(foreach file, $(PDF), $(BUILDIMAGESDIR)/$(file))
 
-# everything considered source
 SRC = $(XML) $(PNG_SRC) $(FIG_SRC) $(CSS) $(EXTRA_SOURCES)
 
 # generate A4 docs

diff --git a/docs/pwg/Makefile.am b/docs/pwg/Makefile.am
index 7343a22..414f2db 100644 (file)
--- a/docs/pwg/Makefile.am
+++ b/docs/pwg/Makefile.am
@@ -16,6 +16,9 @@ CSS = base.css
 PNG_SRC = 
 FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig))
 
+# extra sources to copy in build directory
+EXTRA_SOURCES = 
+
 ### this is the generic bit and you shouln't need to change this
 
 # get the generic docbuilding Makefile stuff