docs: Bump common, fix the upload logic inclusion

Update the common submodule, and fix the docs upload rules to include
the right makefile snippet from common.

diff --git a/common b/common
index c572721..f3bb51b 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c57272152d5c40617fab305d839db1b1fefe0ea0
+Subproject commit f3bb51b867ff403f70d36fc772861d8e57c703ed

diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am
index 535c696..bb8edaa 100644 (file)
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -2,7 +2,7 @@
 
 # base name of doc
 DOC = faq
-# formats defined for upload.mak
+# formats defined for upload-doc.mak
 FORMATS=html ps pdf
 
 # main xml file
@@ -24,7 +24,7 @@ EXTRA_SRC = gst-uninstalled
 # get the generic docbuilding Makefile stuff
 include $(srcdir)/../manuals.mak
 # get the generic upload target
-include $(top_srcdir)/common/upload.mak
+include $(top_srcdir)/common/upload-doc.mak
 
 ### this is standard automake stuff
 

diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index 24270cc..b3c7a9b 100644 (file)
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -9,11 +9,11 @@ ERROR_CFLAGS=
 
 BUILT_SOURCES=gstreamer.types
 
-# for upload.mak
+# for upload-doc.mak
 DOC=gstreamer
 FORMATS=html
 html: html-build.stamp
-include $(top_srcdir)/common/upload.mak
+include $(top_srcdir)/common/upload-doc.mak
 
 # generated basefiles
 #basefiles = \

diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 7113674..f3d3c98 100644 (file)
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -7,11 +7,11 @@ DOC_MODULE=gstreamer-libs
 # don't want $(DOC_MODULE)-scan.c to be built with -Werror
 ERROR_CFLAGS=
 
-# for upload.mak
+# for upload-doc.mak
 DOC=gstreamer-libs
 FORMATS=html
 html: html-build.stamp
-include $(top_srcdir)/common/upload.mak
+include $(top_srcdir)/common/upload-doc.mak
 
 # generated basefiles
 #basefiles = \

diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 2939403..7223fbe 100644 (file)
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -5,7 +5,7 @@ MAKEFLAGS = -j1
 
 # base name of doc
 DOC = manual
-# formats defined for upload.mak
+# formats defined for upload-doc.mak
 FORMATS=html ps pdf
 
 # main xml file
@@ -27,7 +27,7 @@ EXTRA_SRC =
 # get the generic docbuilding Makefile stuff
 include $(srcdir)/../manuals.mak
 # get the generic upload target
-include $(top_srcdir)/common/upload.mak
+include $(top_srcdir)/common/upload-doc.mak
 
 ### this is standard automake stuff
 

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 2051fee..d0753f9 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -7,11 +7,11 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
 MODULE=gstreamer
 DOC_MODULE=$(MODULE)-plugins
 
-# for upload.mak
+# for upload-doc.mak
 DOC=$(MODULE)-plugins
 FORMATS=html
 html: html-build.stamp
-include $(top_srcdir)/common/upload.mak
+include $(top_srcdir)/common/upload-doc.mak
 
 # generated basefiles
 #basefiles = \

diff --git a/docs/pwg/Makefile.am b/docs/pwg/Makefile.am
index 52b4f59..af79dd0 100644 (file)
--- a/docs/pwg/Makefile.am
+++ b/docs/pwg/Makefile.am
@@ -2,7 +2,7 @@
 
 # base name of doc
 DOC = pwg
-# formats defined for upload.mak
+# formats defined for upload-doc.mak
 FORMATS=html ps pdf
 
 # main xml file
@@ -24,7 +24,7 @@ EXTRA_SRC =
 # get the generic docbuilding Makefile stuff
 include $(srcdir)/../manuals.mak
 # get the generic upload target
-include $(top_srcdir)/common/upload.mak
+include $(top_srcdir)/common/upload-doc.mak
 
 ### this is standard automake stuff