From a7458ceea97db7ba96f9953afca7ea7c2944c735 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 29 Apr 2006 01:04:51 +0000 Subject: [PATCH] use common upload.mak Original commit message from CVS: use common upload.mak --- ChangeLog | 2 +- common | 2 +- docs/Makefile.am | 1 - docs/libs/Makefile.am | 2 +- docs/libs/tmpl/gstcolorbalance.sgml | 9 -------- docs/plugins/Makefile.am | 2 +- docs/upload.mak | 33 ----------------------------- 7 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 docs/upload.mak diff --git a/ChangeLog b/ChangeLog index 9483bd0f96..2237c0bbd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,7 +57,7 @@ * ext/alsa/gstalsasink.c: (gst_alsasink_getcaps), (alsasink_parse_spec): - query witdh capabilities from alsa, fixes #338919 + query witdh capabilities from alsa, fixes #338919 2006-04-28 Wim Taymans diff --git a/common b/common index a6710e67fd..6b67aa6dd1 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a6710e67fd82147e32a18f1b63177583faffd498 +Subproject commit 6b67aa6dd111fb139e1be0f6a386e3ff84cce091 diff --git a/docs/Makefile.am b/docs/Makefile.am index 3d88b9fadc..b1feeb833c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -8,7 +8,6 @@ SUBDIRS = $(GTK_DOC_DIRS) DIST_SUBDIRS = libs plugins EXTRA_DIST = \ - upload.mak \ version.entities.in upload: diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index c54dbd7c9b..b9811eda37 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -8,7 +8,7 @@ DOC_MODULE=gst-plugins-base-libs DOC=gst-plugins-base-libs FORMATS=html html: html-build.stamp -include $(srcdir)/../upload.mak +include $(top_srcdir)/common/upload.mak # generated basefiles #basefiles = \ diff --git a/docs/libs/tmpl/gstcolorbalance.sgml b/docs/libs/tmpl/gstcolorbalance.sgml index ccb0ae227b..7ac9f04e8f 100644 --- a/docs/libs/tmpl/gstcolorbalance.sgml +++ b/docs/libs/tmpl/gstcolorbalance.sgml @@ -23,15 +23,6 @@ interface for adjusting color balance settings - - - - - -@gstcolorbalance: the object which received the signal. -@arg1: -@arg2: - diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index ed7ce59e44..e04d457c84 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -11,7 +11,7 @@ DOC_MODULE=$(MODULE)-plugins DOC=$(MODULE)-plugins FORMATS=html html: html-build.stamp -include $(srcdir)/../upload.mak +include $(top_srcdir)/common/upload.mak # generated basefiles #basefiles = \ diff --git a/docs/upload.mak b/docs/upload.mak deleted file mode 100644 index 9df285d245..0000000000 --- a/docs/upload.mak +++ /dev/null @@ -1,33 +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) - -upload: $(FORMATS) - @if test "x$(PACKAGE_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