diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-10-05 11:02:44 +0200 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-10-05 11:02:44 +0200 |
| commit | 326ba8524fdc33233175ed7ad371c0dc6c9daada (patch) | |
| tree | 8752728ae692dee720b66c3caadfe8fa84770c2a /docs | |
| parent | 7c61fbc0f22ea3c673cfb51128485eec907aefb2 (diff) | |
| parent | 4aae58a37c4bde61130a042b5b9d26fd0b969930 (diff) | |
Merge remote-tracking branch 'origin/master' into 0.11
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libs/Makefile.am | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 042852e..cf116ed 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -12,41 +12,16 @@ FORMATS=html html: html-build.stamp include $(top_srcdir)/common/upload-doc.mak -# generated basefiles -#basefiles = \ -## $(DOC_MODULE).types \ -# $(DOC_MODULE)-sections.txt \ -# $(DOC_MODULE)-docs.sgml - -# ugly hack to make -unused.sgml work -#unused-build.stamp: -# BUILDDIR=`pwd` && \ -# cd $(srcdir)/tmpl && \ -# ln -sf gstreamer-libs-unused.sgml \ -# $$BUILDDIR/tmpl/gstreamer-libs-@GST_MAJORMINOR@-unused.sgml -# touch unused-build.stamp - -# these rules are added to create parallel docs using GST_MAJORMINOR -#$(basefiles): gstreamer-libs-@GST_MAJORMINOR@%: gstreamer-libs% -# cp $< $@ - -#CLEANFILES = $(basefiles) - # The top-level SGML file. Change it if you want. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml -# The directory containing the source code. Relative to $(top_srcdir). +# The directory containing the source code. # gtk-doc will search all .c & .h files beneath here for inline comments # documenting functions and macros. -DOC_SOURCE_DIR = $(top_srcdir) +DOC_SOURCE_DIR = $(top_srcdir)/gnl SCAN_OPTIONS= -# FIXME : -# there's something wrong with gstreamer-sections.txt not being in the dist -# maybe it doesn't resolve; we're adding it below for now -#EXTRA_DIST = gstreamer.types.in gstreamer.hierarchy $(DOC_MODULE)-sections.txt gstreamer-sections.txt $(DOC_MAIN_SGML_FILE) - # Extra options to supply to gtkdoc-mkdb. MKDB_OPTIONS=--sgml-mode --source-suffixes=c,h,cc,m @@ -56,10 +31,9 @@ FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html \ --extra-dir=$(GSTPB_PREFIX)/share/gtk-doc/html # Used for dependencies. -HFILE_GLOB=$(DOC_SOURCE_DIR)/gnl/*.h -CFILE_GLOB=$(DOC_SOURCE_DIR)/gnl/*.c +HFILE_GLOB=$(top_srcdir)/gnl/*.h +CFILE_GLOB=$(top_srcdir)/gnl/*.c -SCANOBJ_DEPS = # Extra options to supply to gtkdoc-scan. SCANOBJ_OPTIONS=--type-init-func="g_type_init();gst_init(&argc,&argv)" @@ -90,7 +64,7 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib # contains GtkObjects/GObjects and you want to document signals and properties. GTKDOC_CFLAGS = $(GST_BASE_CFLAGS) -I$(top_builddir) -GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_BASE_LIBS) +GTKDOC_LIBS = $(GST_BASE_LIBS) GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC) GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC) |