Update common/ to latest

7 files changed, 17 insertions, 13 deletions

diff --git a/common b/common
-Subproject f363b3205658a38e84fa77f19dee218cd444527
+Subproject 46d420818ed8172022caf4503894076b18b1e15
diff --git a/common-modified/gst-glib-gen.mak b/common-modified/gst-glib-gen.mak
index d14f5c64..14f1ba37 100644
--- a/common-modified/gst-glib-gen.mak
+++ b/common-modified/gst-glib-gen.mak
@@ -11,16 +11,16 @@ enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
 # these are all the rules generating the relevant files
 $(glib_gen_basename)-enumtypes.h: $(glib_enum_headers)
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
-	--fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+	--fhead "#ifndef __$(glib_enum_define)_ENUM_TYPES_H__\n#define __$(glib_enum_define)_ENUM_TYPES_H__\n\n$(glib_gen_decl_include)\n\nG_BEGIN_DECLS\n" \
 	--fprod "\n/* enumerations from \"@filename@\" */\n" \
-	--vhead "GType @enum_name@_get_type (void);\n#define FS_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
+	--vhead "$(glib_gen_decl_banner)\nGType @enum_name@_get_type (void);\n#define FS_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
 	--ftail "G_END_DECLS\n\n#endif /* __$(glib_enum_define)_ENUM_TYPES_H__ */" \
 	$^ > $@
 
 $(glib_gen_basename)-enumtypes.c: $(glib_enum_headers)
 	@if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
-	--fhead "#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \
+	--fhead "#ifdef HAVE_CONFIG_H\n#include \"config.h\"\n#endif\n\n#include \"$(glib_gen_basename)-enumtypes.h\"\n$(enum_headers)" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
 	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static volatile gsize g_define_type_id__volatile = 0;\n  if (g_once_init_enter (&g_define_type_id__volatile)) {\n    static const G@Type@Value values[] = {"     \
 	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
diff --git a/common-modified/gtk-doc.mak b/common-modified/gtk-doc.mak
index 7caeb8bf..a973b8d7 100644
--- a/common-modified/gtk-doc.mak
+++ b/common-modified/gtk-doc.mak
@@ -121,7 +121,11 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(expand_content_files)
 	@echo '  DOC   Building XML'
-	@gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)  --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) --output-format=xml $(MKDB_OPTIONS)
+	@_source_dir='' ;						\
+	for i in $(DOC_SOURCE_DIR) ; do					\
+	    _source_dir="$${_source_dir} --source-dir=$$i" ;	        \
+	done ;							        \
+	gtkdoc-mkdb --module=$(DOC_MODULE) $${_source_dir}  --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) --output-format=xml $(MKDB_OPTIONS)
 	@cp ../version.entities xml
 	@touch sgml-build.stamp
 
diff --git a/configure.ac b/configure.ac
index c0747192..31be2770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ dnl allow for different autotools
 AS_AUTOTOOLS_ALTERNATE
 
 dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
+AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4")
 
 dnl *** check for arguments to configure ***
 
@@ -422,7 +422,6 @@ docs/Makefile
 docs/libs/Makefile
 docs/plugins/Makefile
 docs/version.entities
-m4/Makefile
 dnl docs/plugins/Makefile
 )
 AC_OUTPUT
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 0f6d2654..4b22d992 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -68,8 +68,8 @@ GTKDOC_LIBS = -static \
 	$(GST_BASE_LIBS) \
 	$(GCOV_LIBS)
 
-GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
+#GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
+#GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
 
 # If you need to override some of the declarations, place them in this file
 # and uncomment this line.
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 7b4913fb..629291b8 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -125,8 +125,8 @@ GTKDOC_LIBS = \
 	$(top_builddir)/gst/fsrawconference/libfsrawconference_doc.la \
 	$(GST_BASE_LIBS) 
 
-GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
+#GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
+#GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)
 
 # If you need to override some of the declarations, place them in this file
 # and uncomment this line.
diff --git a/farstream/Makefile.am b/farstream/Makefile.am
index 510c39c2..36a820d1 100644
--- a/farstream/Makefile.am
+++ b/farstream/Makefile.am
@@ -73,6 +73,7 @@ glib_enum_headers=$(public_headers)
 glib_enum_define=FS
 glib_gen_prefix=_fs
 glib_gen_basename=fs
+glib_gen_decl_include=\#include <glib-object.h>
 
 include $(top_srcdir)/common-modified/gst-glib-gen.mak
 
@@ -83,8 +84,9 @@ introspection_sources = \
 	$(nodist_libfarstreaminclude_HEADERS) \
 	$(libfarstreaminclude_HEADERS)
 
+
 INTROSPECTION_GIRS = Farstream-@FS_APIVERSION@.gir
-Farstream-@FS_APIVERSION@.gir: libfarstream-@FS_APIVERSION@.la
+Farstream_@FS_API_VERSION@_gir: libfarstream_@FS_APIVERSION@.la
 Farstream_@FS_API_VERSION@_gir_NAMESPACE = Farstream
 Farstream_@FS_API_VERSION@_gir_VERSION = @FS_APIVERSION@
 Farstream_@FS_API_VERSION@_gir_LIBS = libfarstream-@FS_APIVERSION@.la
@@ -94,8 +96,7 @@ Farstream_@FS_API_VERSION@_gir_CFLAGS = $(FS_INTERNAL_CFLAGS)
 Farstream_@FS_API_VERSION@_gir_SCANNERFLAGS = --symbol-prefix=fs \
 	--identifier-prefix=Fs --add-init-section="gst_init(NULL,NULL);" \
 	--pkg-export=farstream-@FS_APIVERSION@ \
-	$(foreach hdr,$(public_headers),--c-include=$(hdr))
-Farstream_@FS_API_VERSION@_gir_LDFLAGS = $(GST_LIBS)
+	$(foreach hdr,$(public_headers),--c-include=$(hdr)) --include-last-in-header=gst/gst.h
 
 girdir = $(datadir)/gir-1.0
 dist_gir_DATA = Farstream-@FS_APIVERSION@.gir