clean up docs build a little; have docdir be an overridable install location;...

clean up docs build a little; have docdir be an overridable install location; separate gtk-doc and docbook bits

Original commit message from CVS:
clean up docs build a little; have docdir be an overridable install location; separate gtk-doc and docbook bits
parent 2a7078e1
2005-09-03 Thomas Vander Stichele <thomas at apestaart dot org>
* Makefile.am:
* autogen.sh:
* configure.ac:
* docs/Makefile.am:
* docs/faq/Makefile.am:
* docs/gst/tmpl/gstelement.sgml:
* docs/gst/tmpl/gsttypes.sgml:
* docs/htmlinstall.mak:
* docs/manual/Makefile.am:
* docs/pwg/Makefile.am:
reorganize doc build a little
split out docbook and gtk-doc stuff
have two separate --enable's and enable them through autogen
but disable by default in configure (to be similar to other
projects)
* gstreamer.spec.in:
clean up docs install
* po/af.po:
* po/az.po:
* po/ca.po:
* po/cs.po:
* po/de.po:
* po/en_GB.po:
* po/fr.po:
* po/it.po:
* po/nb.po:
* po/nl.po:
* po/ru.po:
* po/sq.po:
* po/sr.po:
* po/sv.po:
* po/tr.po:
* po/uk.po:
* po/vi.po:
translation updates
2005-09-03 Tim-Philipp Müller <tim at centricular dot net>
* gst/base/gstbasesink.c: (gst_base_sink_pad_buffer_alloc):
......
PACKAGE = @PACKAGE@
VERSION = @VERSION@
if BUILD_DOCS
SUBDIRS_DOCS = docs
else
SUBDIRS_DOCS =
endif
if BUILD_TESTS
## SUBDIRS_TESTS = tests testsuite
## FIXME: write tests from scratch
......@@ -44,9 +38,9 @@ SUBDIRS = \
$(SUBDIRS_CHECK) \
$(SUBDIRS_TESTS) \
$(SUBDIRS_EXAMPLES) \
docs \
pkgconfig po \
common \
$(SUBDIRS_DOCS)
common
# These are all the possible subdirs
DIST_SUBDIRS = \
......@@ -55,10 +49,10 @@ DIST_SUBDIRS = \
check \
tests testsuite \
examples \
docs \
pkgconfig \
po \
common \
docs
common
win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
......
......@@ -23,7 +23,7 @@ then
fi
. common/gst-autogen.sh
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-failing-tests --enable-poisoning'
CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-failing-tests --enable-poisoning --enable-gtk-doc --enable-docbook'
autogen_options $@
......
common @ 6fa4fecc
Subproject commit cd012821aa2e4f6247f4cd6dee14116f86421a7e
Subproject commit 6fa4feccd5953a16dcf78f4c2bb3eca8040114ba
......@@ -113,15 +113,19 @@ AC_ARG_WITH(pkg-config-path,
[colon-separated list of pkg-config(1) dirs]),
[export PKG_CONFIG_PATH=${withval}])
GST_DOC()
GST_ARCH()
dnl ### Documentation checks
dnl Perl is used in building documentation
AC_PATH_PROG(PERL_PATH, perl, no)
if test x$PERL_PATH = xno; then
AC_MSG_ERROR(Could not find perl)
fi
GST_DOCBOOK_CHECK
GTK_DOC_CHECK([1.3])
AC_PROG_AWK
dnl we require bison for building the parser
......@@ -685,8 +689,6 @@ docs/faq/Makefile
docs/gst/Makefile
docs/libs/Makefile
docs/manual/Makefile
docs/plugins/Makefile
docs/plugins/gstreamer-plugins.types
docs/pwg/Makefile
docs/xsl/Makefile
docs/version.entities
......
if BUILD_PLUGIN_DOCS
SUBDIRS_PLUGINS = plugins
if ENABLE_GTK_DOC
SUBDIRS_GTK_DOC = gst libs
else
SUBDIRS_PLUGINS =
SUBDIRS_GTK_DOC =
endif
# FIXME: separate this out into docbook and gtk-doc so it doesn't descend
# for docs it can't build
if BUILD_DOCS
SUBDIRS_DOCS = faq manual pwg gst libs
if ENABLE_DOCBOOK
SUBDIRS_DOCBOOK = faq manual pwg
else
SUBDIRS_DOCS =
SUBDIRS_DOCBOOK =
endif
SUBDIRS = $(SUBDIRS_DOCS) $(SUBDIRS_PLUGINS)
DIST_SUBDIRS = gst faq manual pwg libs plugins xsl
SUBDIRS = $(SUBDIRS_DOCBOOK) $(SUBDIRS_GTK_DOC)
DIST_SUBDIRS = gst faq manual pwg libs xsl
EXTRA_DIST = \
slides manuals.mak htmlinstall.mak upload.mak \
image-png image-pdf image-eps url.entities version.entities.in
upload:
@if test "x$(SUBDIRS_DOCS)" != x; then for a in $(SUBDIRS_DOCS); do cd $$a; make upload; cd ..; done; fi
dist-hook:
$(RM) -rf $(distdir)/random/CVS
$(RM) -rf $(distdir)/random/*~
$(RM) -rf $(distdir)/random/.\#*
$(RM) -rf $(distdir)/slides/CVS
$(RM) -rf $(distdir)/slides/*~
$(RM) -rf $(distdir)/slides/.\#*
@if test "x$(SUBDIRS)" != x; then for a in $(SUBDIRS); do cd $$a; make upload; cd ..; done; fi
......@@ -32,7 +32,7 @@ include $(srcdir)/../upload.mak
EXTRA_DIST = $(SRC)
# install documentation
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC)
doc_DATA = $(PDF_DAT) $(PS_DAT)
faqdir = $(docdir)/$(DOC)
faq_DATA = $(PDF_DAT) $(PS_DAT)
include $(srcdir)/../htmlinstall.mak
......@@ -221,14 +221,6 @@ This macro returns the currently pending state of the element.
@elem:
<!-- ##### MACRO GST_STATE_CHANGE_NO_PREROLL ##### -->
<para>
</para>
@obj:
<!-- ##### MACRO GST_STATE_SIGNAL ##### -->
<para>
......
......@@ -17,6 +17,27 @@ various global enums and constants
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### ENUM GstState ##### -->
<para>
</para>
@GST_STATE_VOID_PENDING:
@GST_STATE_NULL:
@GST_STATE_READY:
@GST_STATE_PAUSED:
@GST_STATE_PLAYING:
<!-- ##### ENUM GstStateChangeReturn ##### -->
<para>
</para>
@GST_STATE_CHANGE_FAILURE:
@GST_STATE_CHANGE_SUCCESS:
@GST_STATE_CHANGE_ASYNC:
@GST_STATE_CHANGE_NO_PREROLL:
<!-- ##### ENUM GstRank ##### -->
<para>
Element priority ranks. Defines the order in which the autoplugger (or similar
......
......@@ -4,12 +4,12 @@
if DOC_HTML
install-data-local: html
$(mkinstalldirs) $(DESTDIR)$(docdir)
cp -pr $(HTML_DAT) $(DESTDIR)$(docdir)
$(mkinstalldirs) $(DESTDIR)$(docdir)/$(DOC)
cp -pr $(HTML_DAT) $(DESTDIR)$(docdir)/$(DOC)
uninstall-local:
for part in $(HTML_DAT); do rm -rf $(DESTDIR)$(docdir)/$$part; done
if test -d $(DESTDIR)$(docdir); then rmdir $(DESTDIR)$(docdir); fi
if test -d $(DESTDIR)$(docdir)/$(DOC); then rmdir $(DESTDIR)$(docdir)/$(DOC); fi
else
install-data-local:
uninstall-local:
......
......@@ -32,7 +32,7 @@ include $(srcdir)/../upload.mak
EXTRA_DIST = $(SRC) README
# install documentation
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC)
doc_DATA = $(PDF_DAT) $(PS_DAT)
manualdir = $(docdir)/$(DOC)
manual_DATA = $(PDF_DAT) $(PS_DAT)
include $(srcdir)/../htmlinstall.mak
......@@ -32,7 +32,7 @@ include $(srcdir)/../upload.mak
EXTRA_DIST = $(SRC)
# install documentation
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC)
doc_DATA = $(PDF_DAT) $(PS_DAT)
pwgdir = $(docdir)/$(DOC)
pwg_DATA = $(PDF_DAT) $(PS_DAT)
include $(srcdir)/../htmlinstall.mak
......@@ -96,8 +96,8 @@ with different major/minor versions of GStreamer.
%build
%configure \
--enable-debug \
--with-cachedir=%{_localstatedir}/cache/gstreamer-%{majorminor} \
--enable-gtk-doc --enable-docbook \
--disable-tests --disable-examples
make
......@@ -179,7 +179,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-, root, root, -)
%doc installed-doc/*
%doc installed-doc/faq installed-doc/pwg installed-doc/manual
%dir %{_includedir}/gstreamer-%{majorminor}
%dir %{_includedir}/gstreamer-%{majorminor}/gst
%{_includedir}/gstreamer-%{majorminor}/gst/*.h
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gstreamer 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-07-29 14:35+0200\n"
"POT-Creation-Date: 2005-09-02 19:11+0200\n"
"PO-Revision-Date: 2004-03-24 11:28+0200\n"
"Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
"Language-Team: Afrikaans <i18n@af.org.za>\n"
......@@ -15,30 +15,30 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: gst/gst.c:157
#: gst/gst.c:275
msgid "Print the GStreamer version"
msgstr "Vertoon die GStreamer weergawe"
#: gst/gst.c:159
#: gst/gst.c:277
msgid "Make all warnings fatal"
msgstr "Maak alle waarskuwings fataal"
#: gst/gst.c:163
#: gst/gst.c:281
msgid "Print available debug categories and exit"
msgstr "Vertoon beskikbare ontfoutkategori en stop"
#: gst/gst.c:166
#: gst/gst.c:284
msgid ""
"Default debug level from 1 (only error) to 5 (anything) or 0 for no output"
msgstr ""
"Verstek ontfoutvlak vanaf 1 (slegs fout) tot 5 (enigiets) of 0 vir geen "
"afvoer"
#: gst/gst.c:168
#: gst/gst.c:286
msgid "LEVEL"
msgstr "VLAK"
#: gst/gst.c:170
#: gst/gst.c:288
msgid ""
"Comma-separated list of category_name:level pairs to set specific levels for "
"the individual categories. Example: GST_AUTOPLUG:5,GST_ELEMENT_*:3"
......@@ -46,27 +46,27 @@ msgstr ""
"Komma-geskeide lys van kategorie_naam:vlak pare om die individuele "
"kategorie op te stel. Byvoorbeeld: GST_AUTOPLUG:5,GST_ELEMENT_*:3"
#: gst/gst.c:173
#: gst/gst.c:291
msgid "LIST"
msgstr "LYS"
#: gst/gst.c:175
#: gst/gst.c:293
msgid "Disable colored debugging output"
msgstr "Skakel gekleurde ontfout-afvoer af"
#: gst/gst.c:177
#: gst/gst.c:295
msgid "Disable debugging"
msgstr "Skakel ontfouting af"
#: gst/gst.c:181
#: gst/gst.c:299
msgid "Enable verbose plugin loading diagnostics"
msgstr "Aktiveer volledige diagnostiese boodskappe vir inproplaaiing"
#: gst/gst.c:183
#: gst/gst.c:301
msgid "PATHS"
msgstr "PAAIE"
#: gst/gst.c:186
#: gst/gst.c:304
#, fuzzy
msgid ""
"Comma-separated list of plugins to preload in addition to the list stored in "
......@@ -75,33 +75,33 @@ msgstr ""
"Komma-geskeide lys van inproppe om vooraf te laai by die lys gestoor in die "
"omgewingsveranderlike GST_PLUGIN_PATH"
#: gst/gst.c:188
#: gst/gst.c:306
msgid "PLUGINS"
msgstr "INPROPPE"
#: gst/gst.c:191
#: gst/gst.c:309
msgid "Disable trapping of segmentation faults during plugin loading"
msgstr "Moenie segmenteringsfoute tydens inproplaaiing ondervang nie"
#: gst/gst.c:194
#: gst/gst.c:312
msgid "Registry to use"
msgstr "Register om te gebruik"
#: gst/gst.c:194
#: gst/gst.c:312
msgid "REGISTRY"
msgstr "REGISTER"
#: gst/gst.c:207
#: gst/gst.c:325
#, fuzzy, c-format
msgid "path list for loading plugins (separated by '%s')"
msgstr "lys van paaie waaruit inproppe gelaai word (geskei met '"
#: gst/gstelement.c:226
#: gst/gstelement.c:227
#, c-format
msgid "ERROR: from element %s: %s\n"
msgstr "FOUT: vanaf element %s: %s\n"
#: gst/gstelement.c:228
#: gst/gstelement.c:229
#, c-format
msgid ""
"Additional debug info:\n"
......@@ -110,11 +110,11 @@ msgstr ""
"Addisionele ontfout-inligting:\n"
"%s\n"
#: gst/gsterror.c:56
#: gst/gsterror.c:61
msgid "GStreamer encountered a general core library error."
msgstr "GStreamer het 'n fout tegekom in die algemene kernbiblioteek."
#: gst/gsterror.c:58 gst/gsterror.c:94 gst/gsterror.c:114 gst/gsterror.c:144
#: gst/gsterror.c:63 gst/gsterror.c:99 gst/gsterror.c:119 gst/gsterror.c:149
msgid ""
"GStreamer developers were too lazy to assign an error code to this error. "
"Please file a bug."
......@@ -122,168 +122,168 @@ msgstr ""
"GStreamer ontwikkelaars was te lui om 'n foutkode vir hierdie fout toe te "
"ken. Meld asb. die fout aan."
#: gst/gsterror.c:62
#: gst/gsterror.c:67
#, fuzzy
msgid "Internal GStreamer error: code not implemented. Please file a bug."
msgstr ""
"Interne GStreamer-fout: \"code not implemented\". Meld die fout aan asb."
#: gst/gsterror.c:64
#: gst/gsterror.c:69
#, fuzzy
msgid "Internal GStreamer error: state change failed. Please file a bug."
msgstr ""
"Interne GStreamer-fout: \"state change failed\". Meld die fout aan asb."
#: gst/gsterror.c:66
#: gst/gsterror.c:71
#, fuzzy
msgid "Internal GStreamer error: pad problem. Please file a bug."
msgstr "Interne GStreamer-fout: \"pad problem.\" Meld die fout aan asb."
#: gst/gsterror.c:68
#: gst/gsterror.c:73
#, fuzzy
msgid "Internal GStreamer error: thread problem. Please file a bug."
msgstr "Interne GStreamer-fout: \"thread problem\". Meld die fout aan asb."
#: gst/gsterror.c:70
#: gst/gsterror.c:75
#, fuzzy
msgid "Internal GStreamer error: negotiation problem. Please file a bug."
msgstr ""
"Interne GStreamer-fout: \"negotiation problem\". Meld die fout aan asb."
#: gst/gsterror.c:72
#: gst/gsterror.c:77
#, fuzzy
msgid "Internal GStreamer error: event problem. Please file a bug."
msgstr "Interne GStreamer-fout: \"event problem\". Meld die fout aan asb."
#: gst/gsterror.c:74
#: gst/gsterror.c:79
#, fuzzy
msgid "Internal GStreamer error: seek problem. Please file a bug."
msgstr "Interne GStreamer-fout: \"seek problem\". Meld die fout aan asb."
#: gst/gsterror.c:76
#: gst/gsterror.c:81
#, fuzzy
msgid "Internal GStreamer error: caps problem. Please file a bug."
msgstr "Interne GStreamer-fout: \"caps problem\". Meld die fout aan asb."
#: gst/gsterror.c:78
#: gst/gsterror.c:83
#, fuzzy
msgid "Internal GStreamer error: tag problem. Please file a bug."
msgstr "Interne GStreamer-fout: \"tag problem\". Meld die fout aan asb."
#: gst/gsterror.c:92
#: gst/gsterror.c:97
msgid "GStreamer encountered a general supporting library error."
msgstr ""
"GStreamer het 'n fout tegekom in 'n algemene ondersteuningsbiblioteek."
#: gst/gsterror.c:96
#: gst/gsterror.c:101
msgid "Could not initialize supporting library."
msgstr "Ondersteuningsbiblioteek kon nie aan die gang gesit word nie."
#: gst/gsterror.c:97 gst/gsterror.c:98
#: gst/gsterror.c:102 gst/gsterror.c:103
msgid "Could not close supporting library."
msgstr "Kon nie ondersteunende biblioteek toemaak nie."
#: gst/gsterror.c:112
#: gst/gsterror.c:117
#, fuzzy
msgid "GStreamer encountered a general resource error."
msgstr "GStreamer het 'n fout tegekom in die algemene kernbiblioteek."
#: gst/gsterror.c:116
#: gst/gsterror.c:121
msgid "Resource not found."
msgstr "Hulpbron nie gevind nie."
#: gst/gsterror.c:117
#: gst/gsterror.c:122
msgid "Resource busy or not available."
msgstr "Hulpbron is besig of nie beskikbaar nie."
#: gst/gsterror.c:118
#: gst/gsterror.c:123
msgid "Could not open resource for reading."
msgstr "Kon nie hulpbron oopmaak om te lees nie."
#: gst/gsterror.c:119
#: gst/gsterror.c:124
msgid "Could not open resource for writing."
msgstr "Kon nie hulpbron oopmaak om te skryf nie."
#: gst/gsterror.c:121
#: gst/gsterror.c:126
msgid "Could not open resource for reading and writing."
msgstr "Kon nie hulpbron oopmaak vir lees en skryf nie."
#: gst/gsterror.c:122
#: gst/gsterror.c:127
msgid "Could not close resource."
msgstr "Kon nie hulpbron toemaak nie."
#: gst/gsterror.c:123
#: gst/gsterror.c:128
msgid "Could not read from resource."
msgstr "Kon nie uit hulpbron lees nie."
#: gst/gsterror.c:124
#: gst/gsterror.c:129
msgid "Could not write to resource."
msgstr "Kon nie na hulpbron skryf nie."
#: gst/gsterror.c:125
#: gst/gsterror.c:130
msgid "Could not perform seek on resource."
msgstr "Kon nie soekopdrag uitvoer op hulpbron nie."
#: gst/gsterror.c:126
#: gst/gsterror.c:131
msgid "Could not synchronize on resource."
msgstr "Kon nie hulpbron sinkroniseer nie."
#: gst/gsterror.c:128
#: gst/gsterror.c:133
msgid "Could not get/set settings from/on resource."
msgstr "Kon nie hulpbronstellings verkry/verander nie."
#: gst/gsterror.c:142
#: gst/gsterror.c:147
#, fuzzy
msgid "GStreamer encountered a general stream error."
msgstr "GStreamer het 'n fout tegekom in die algemene kernbiblioteek."
#: gst/gsterror.c:147
#: gst/gsterror.c:152
msgid "Element doesn't implement handling of this stream. Please file a bug."
msgstr ""
"Element implementeer nie die hantering van hierdie stroom nie. Meld asb. 'n "
"fout aan."
#: gst/gsterror.c:149
#: gst/gsterror.c:154
msgid "Could not determine type of stream."
msgstr "Kon nie die stroomtipe bepaal nie."
#: gst/gsterror.c:151
#: gst/gsterror.c:156
msgid "The stream is of a different type than handled by this element."
msgstr ""
"Die stroom is nie van dieselfde tipe as wat deur die element hanteer word "
"nie."
#: gst/gsterror.c:153
#: gst/gsterror.c:158
msgid "There is no codec present that can handle the stream's type."
msgstr ""
"Daar is nie 'n kodek beskikbaar om hierdie stroom se tipe te hanteer nie."
#: gst/gsterror.c:154
#: gst/gsterror.c:159
msgid "Could not decode stream."
msgstr "Kon nie stroom dekodeer nie."
#: gst/gsterror.c:155
#: gst/gsterror.c:160
msgid "Could not encode stream."
msgstr "Kon nie stroom enkodeer nie."
#: gst/gsterror.c:156
#: gst/gsterror.c:161
msgid "Could not demultiplex stream."
msgstr "Kon nie stroom demultiplekseer nie."
#: gst/gsterror.c:157
#: gst/gsterror.c:162
msgid "Could not multiplex stream."
msgstr "Kon nie stroom multiplekseer nie."
#: gst/gsterror.c:158
#: gst/gsterror.c:163
msgid "Stream is of the wrong format."
msgstr "Stroom het die verkeerde formaat."
#: gst/gsterror.c:206
#: gst/gsterror.c:211
#, c-format
msgid "No error message for domain %s."
msgstr "Geen foutboodskap vir domein %s."
#: gst/gsterror.c:214
#: gst/gsterror.c:219
#, c-format
msgid "No standard error message for domain %s and code %d."
msgstr "Geen standaard foutboodskap vir domein %s en kode %d."
......@@ -556,49 +556,57 @@ msgstr "terugspeelversterking albumtoppunt"
msgid "peak of the album"
msgstr "toppunt van die album"
#: gst/gsttag.c:229
#: gst/gsttag.c:192
msgid "language code"
msgstr ""
#: gst/gsttag.c:193
msgid "language code for this stream, conforming to ISO-639-1"
msgstr ""
#: gst/gsttag.c:232
msgid ", "
msgstr ", "
#: gst/elements/gstfilesink.c:229
#: gst/elements/gstfilesink.c:241
msgid "No file name specified for writing."
msgstr "Geen lernaam om heen te skryf nie."
#: gst/elements/gstfilesink.c:236
#: gst/elements/gstfilesink.c:248
#, c-format
msgid "Could not open file \"%s\" for writing."
msgstr "Kon nie ler \"%s\" oopmaak om in te skryf nie."
#: gst/elements/gstfilesink.c:251
#: gst/elements/gstfilesink.c:263
#, c-format
msgid "Error closing file \"%s\"."
msgstr "Fout met toemaak van ler \"%s\"."
#: gst/elements/gstfilesink.c:313 gst/elements/gstfilesink.c:346
#: gst/elements/gstfilesink.c:345 gst/elements/gstfilesink.c:399
#, c-format
msgid "Error while writing to file \"%s\"."
msgstr "Fout tydens skryf na ler \"%s\"."
#: gst/elements/gstfilesrc.c:858
#: gst/elements/gstfilesrc.c:872
msgid "No file name specified for reading."
msgstr "Geen lernaam om uit te lees nie."