From c6c769aa8a6b711e9fbc74482c6d3747730ab542 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@noraisin.net>
Date: Thu, 11 Jun 2009 13:32:22 +0100
Subject: docs: Bump common. Use upload-doc.mak instead of upload.mak

Remove the local copy of upload.mak in favour of using the shared
upload-doc.make in common/
---
 common                   |  2 +-
 docs/Makefile.am         |  1 -
 docs/plugins/Makefile.am |  4 ++--
 docs/upload.mak          | 35 -----------------------------------
 4 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 docs/upload.mak

diff --git a/common b/common
index c5727215..f3bb51b8 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c57272152d5c40617fab305d839db1b1fefe0ea0
+Subproject commit f3bb51b867ff403f70d36fc772861d8e57c703ed
diff --git a/docs/Makefile.am b/docs/Makefile.am
index baeaceb0..10847b58 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -9,7 +9,6 @@ DIST_SUBDIRS = plugins
 
 EXTRA_DIST = \
         random/ChangeLog-0.8 \
-	upload.mak \
         version.entities.in
 
 upload:
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 15a9d960..5d7c06c6 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -7,11 +7,11 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
 MODULE=gst-plugins-good
 DOC_MODULE=$(MODULE)-plugins
 
-# for upload.mak
+# for upload-doc.mak
 DOC=$(MODULE)-plugins
 FORMATS=html
 html: html-build.stamp
-include $(srcdir)/../upload.mak
+include $(top_srcdir)/common/upload-doc.mak
 
 # generated basefiles
 #basefiles = \
diff --git a/docs/upload.mak b/docs/upload.mak
deleted file mode 100644
index cff4c49b..00000000
--- a/docs/upload.mak
+++ /dev/null
@@ -1,35 +0,0 @@
-# this snippet is to be included by both our docbook manuals
-# and gtk-doc API references
-
-# it adds an upload target to each of these dir's Makefiles
-
-# each Makefile.am should define the following variables:
-# - DOC: the base name of the documentation
-#        (faq, manual, pwg, gstreamer, gstreamer-libs)
-# - FORMATS: the formats in which DOC is output
-#            (html ps pdf)
-
-# if you want to use it, make sure your ..sh/config file contains the
-# correct User entry for the Host entry for the DOC_SERVER
-
-# these variables define the location of the online docs
-DOC_SERVER=gstreamer.freedesktop.org
-DOC_BASE=/srv/gstreamer.freedesktop.org/www/data/doc
-DOC_URL=$(DOC_SERVER):$(DOC_BASE)
-GST_VERSION_NANO = $(GST_PLUGINS_GOOD_VERSION_NANO)
-
-
-upload: $(FORMATS)
-	@if test "x$(GST_VERSION_NANO)" = x0; then \
-            export DOCVERSION=$(VERSION); \
-        else export DOCVERSION=head; \
-        fi; \
-        export DIR=$(DOC_BASE)/gstreamer/$$DOCVERSION/$(DOC); \
-	ssh $(DOC_SERVER) mkdir -p $$DIR; \
-	if echo $(FORMATS) | grep html > /dev/null; then export SRC="$$SRC html"; fi; \
-	if echo $(FORMATS) | grep ps > /dev/null; then export SRC="$$SRC $(DOC).ps"; fi; \
-	if echo $(FORMATS) | grep pdf > /dev/null; then export SRC="$$SRC $(DOC).pdf"; fi; \
-	echo Uploading $$SRC to $(DOC_SERVER):$$DIR; \
-	rsync -rv -e ssh --delete $$SRC $(DOC_SERVER):$$DIR; \
-	ssh $(DOC_SERVER) chmod -R g+w $$DIR; \
-	echo Done
-- 
cgit