diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2009-06-11 13:32:22 +0100 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2009-06-11 13:32:22 +0100 |
| commit | c6c769aa8a6b711e9fbc74482c6d3747730ab542 (patch) | |
| tree | 411fe7c7d5b08bc0d427cb76502382365824dc7d | |
| parent | 6d32642887c79e3d2ac9ef9b7e8bb2f13b3f3d8d (diff) | |
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/
| m--------- | common | 0 | ||||
| -rw-r--r-- | docs/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 4 | ||||
| -rw-r--r-- | docs/upload.mak | 35 |
4 files changed, 2 insertions, 38 deletions
diff --git a/common b/common -Subproject c57272152d5c40617fab305d839db1b1fefe0ea +Subproject f3bb51b867ff403f70d36fc772861d8e57c703e diff --git a/docs/Makefile.am b/docs/Makefile.am index baeaceb02..10847b58e 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 15a9d9601..5d7c06c66 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 cff4c49b3..000000000 --- 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 |