diff options
| author | gb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969> | 2010-03-29 14:31:17 +0000 |
|---|---|---|
| committer | gb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969> | 2010-03-29 14:31:17 +0000 |
| commit | 1df2dfaab0f530cbe68c59c94eb7d146360cf148 (patch) | |
| tree | 53fe81ddd9cea89073f878e25468420348c48447 /docs | |
| parent | ff152c2c1b21eceae4826e182613beb3fc290224 (diff) | |
Fix doc build.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/libs/Makefile.am | 30 | ||||
| -rw-r--r-- | docs/reference/libs/libs.core.types (renamed from docs/reference/libs/libs.types) | 4 | ||||
| -rw-r--r-- | docs/reference/libs/libs.glx.types | 3 | ||||
| -rw-r--r-- | docs/reference/libs/libs.x11.types | 2 |
4 files changed, 28 insertions, 11 deletions
diff --git a/docs/reference/libs/Makefile.am b/docs/reference/libs/Makefile.am index 99947eef..6ed7d8ac 100644 --- a/docs/reference/libs/Makefile.am +++ b/docs/reference/libs/Makefile.am @@ -23,6 +23,13 @@ DOC_SOURCE_DIR = $(top_srcdir)/gst-libs/gst/vaapi # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS = --type-init-func="g_type_init()" +# List files used by scanobj +SCANOBJ_TYPES = $(srcdir)/$(DOC_MODULE).core.types +SCANOBJ_TYPES += $(srcdir)/$(DOC_MODULE).x11.types +if USE_GLX +SCANOBJ_TYPES += $(srcdir)/$(DOC_MODULE).glx.types +endif + # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" SCAN_OPTIONS = --deprecated-guards="GST_VAAPI_DISABLE_DEPRECATED" @@ -47,7 +54,7 @@ FIXXREF_OPTIONS = \ # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c HFILE_GLOB = $(top_srcdir)/gst-libs/gst/vaapi/*.h -CFILE_GLOB = $(top_srcdir)/gst-libs/gst/vaapi/*.c +CFILE_GLOB = $(top_srcdir)/gst-libs/gst/vaapi/*.c $(srcdir)/$(DOC_MODULE).types # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h @@ -84,16 +91,25 @@ expand_content_files = \ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES = \ + $(GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/gst-libs \ - -I$(top_srcdir)/gst-libs/gst/vaapi \ - $(GLIB_CFLAGS) + -I$(top_srcdir)/gst-libs/gst/vaapi GTKDOC_LIBS = \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la \ - $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_MAJORMINOR).la \ - $(GLIB_LIBS) + $(GLIB_LIBS) \ + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la + +GTKDOC_LIBS += \ + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la + +if USE_GLX +GTKDOC_LIBS += \ + $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_MAJORMINOR).la +endif + +$(srcdir)/$(DOC_MODULE).types: $(SCANOBJ_TYPES) + cat $(SCANOBJ_TYPES) > $@ # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/docs/reference/libs/libs.types b/docs/reference/libs/libs.core.types index 0bd9e59a..a33c3533 100644 --- a/docs/reference/libs/libs.types +++ b/docs/reference/libs/libs.core.types @@ -1,6 +1,4 @@ gst_vaapi_display_get_type -gst_vaapi_display_glx_get_type -gst_vaapi_display_x11_get_type gst_vaapi_image_get_type gst_vaapi_image_pool_get_type gst_vaapi_object_get_type @@ -11,5 +9,3 @@ gst_vaapi_video_buffer_get_type gst_vaapi_video_pool_get_type gst_vaapi_video_sink_get_type gst_vaapi_window_get_type -gst_vaapi_window_glx_get_type -gst_vaapi_window_x11_get_type diff --git a/docs/reference/libs/libs.glx.types b/docs/reference/libs/libs.glx.types new file mode 100644 index 00000000..6ecd3545 --- /dev/null +++ b/docs/reference/libs/libs.glx.types @@ -0,0 +1,3 @@ +gst_vaapi_display_glx_get_type +gst_vaapi_texture_get_type +gst_vaapi_window_glx_get_type diff --git a/docs/reference/libs/libs.x11.types b/docs/reference/libs/libs.x11.types new file mode 100644 index 00000000..c083ce07 --- /dev/null +++ b/docs/reference/libs/libs.x11.types @@ -0,0 +1,2 @@ +gst_vaapi_display_x11_get_type +gst_vaapi_window_x11_get_type |