Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gstreamer.git] / docs / plugins / Makefile.am

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index b511a43..683475b 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -13,33 +13,13 @@ 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)/gst $(top_srcdir)/ext $(top_srcdir)/sys
 
 # Extra options to supply to gtkdoc-scan.
 SCAN_OPTIONS=
@@ -53,14 +33,11 @@ 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)/*/*/*.h
-CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.c $(DOC_SOURCE_DIR)/*/*/*.cc $(DOC_SOURCE_DIR)/*/*/*.m
-
-# this is a wingo addition
-# thomasvs: another nice wingo addition would be an explanation on why
-# this is useful ;)
-
-SCANOBJ_DEPS =
+HFILE_GLOB= \
+  $(top_srcdir)/gst/*/*.h $(top_srcdir)/ext/*/*.h $(top_srcdir)/sys/*/*.h
+CFILE_GLOB= \
+  $(top_srcdir)/gst/*/*.c $(top_srcdir)/ext/*/*.c $(top_srcdir)/sys/*/*.c \
+  $(top_srcdir)/ext/*/*.cc $(top_srcdir)/sys/*/*.m
 
 # Header files to ignore when scanning.
 IGNORE_HFILES = 
@@ -84,17 +61,10 @@ EXTRA_HFILES = \
        $(top_srcdir)/ext/cairo/gstcairooverlay.h \
        $(top_srcdir)/ext/dv/gstdvdec.h \
        $(top_srcdir)/ext/dv/gstdvdemux.h \
-       $(top_srcdir)/ext/esd/esdsink.h \
        $(top_srcdir)/ext/flac/gstflacdec.h \
        $(top_srcdir)/ext/flac/gstflacenc.h \
        $(top_srcdir)/ext/flac/gstflactag.h \
-       $(top_srcdir)/ext/gconf/gstgconfaudiosrc.h \
-       $(top_srcdir)/ext/gconf/gstgconfaudiosink.h \
-       $(top_srcdir)/ext/gconf/gstgconfvideosrc.h \
-       $(top_srcdir)/ext/gconf/gstgconfvideosink.h \
        $(top_srcdir)/ext/gdk_pixbuf/gstgdkpixbufsink.h \
-       $(top_srcdir)/ext/hal/gsthalaudiosink.h \
-       $(top_srcdir)/ext/hal/gsthalaudiosrc.h \
        $(top_srcdir)/ext/jack/gstjackaudiosrc.h \
        $(top_srcdir)/ext/jack/gstjackaudiosink.h \
        $(top_srcdir)/ext/jpeg/gstjpegdec.h \
@@ -188,10 +158,12 @@ EXTRA_HFILES = \
        $(top_srcdir)/gst/monoscope/gstmonoscope.h \
        $(top_srcdir)/gst/multifile/gstmultifilesink.h \
        $(top_srcdir)/gst/multifile/gstmultifilesrc.h \
+       $(top_srcdir)/gst/multifile/gstsplitfilesrc.h \
        $(top_srcdir)/gst/multipart/multipartdemux.h \
        $(top_srcdir)/gst/multipart/multipartmux.h \
-       $(top_srcdir)/gst/quicktime/qtdemux.h \
-       $(top_srcdir)/gst/quicktime/gstqtmux.h \
+       $(top_srcdir)/gst/isomp4/qtdemux.h \
+       $(top_srcdir)/gst/isomp4/gstqtmux.h \
+       $(top_srcdir)/gst/isomp4/gstqtmux-doc.h \
        $(top_srcdir)/gst/replaygain/gstrganalysis.h \
        $(top_srcdir)/gst/replaygain/gstrglimiter.h \
        $(top_srcdir)/gst/replaygain/gstrgvolume.h \
@@ -259,7 +231,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)