diff --git a/ChangeLog b/ChangeLog index 56b86356b0..73b10402ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,14 @@ -2005-11-24 msmith,,, +2005-11-24 Thomas Vander Stichele + + Patch by: Stefan Kost + + * common/gtk-doc.mak: + * docs/gst/Makefile.am: + * docs/libs/Makefile.am: + Fix distcheck issues for the libraries docs build + Closes #319599. + +2005-11-24 Michael Smith * docs/manual/basics-helloworld.xml: Fix bug #315027: memory leak in example code in docs. diff --git a/common b/common index ea1409191c..1b24580b06 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit ea1409191cc1e71273b2dbdd94e7ab5fc5a60a51 +Subproject commit 1b24580b06e738f920b33ea68dffd83d953f0bba diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index 8f450560e9..7d75d1722d 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -37,6 +37,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting functions and macros. DOC_SOURCE_DIR=$(top_srcdir)/gst +DOC_BUILD_DIR=$(top_builddir)/gst # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--deprecated-guards="GST_DISABLE_DEPRECATED" diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index f28de4991a..2d7b3eab74 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -37,6 +37,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml # gtk-doc will search all .c & .h files beneath here for inline comments # documenting functions and macros. DOC_SOURCE_DIR=$(top_srcdir)/libs/gst +DOC_BUILD_DIR=$(top_builddir)/libs/gst # Extra options to supply to gtkdoc-scan. SCAN_OPTIONS=--deprecated-guards="GST_DISABLE_DEPRECATED"