diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2009-06-11 13:51:06 +0100 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2009-06-11 13:51:06 +0100 |
| commit | 2cac0d5383810b7e246dbe23cd2593454c7eca69 (patch) | |
| tree | 306fbdc0d32bf78ec07f7d7108f3dd803d160747 /docs | |
| parent | 9592436bc755308d6f5faf52528889661e22d294 (diff) | |
docs: Bump common. Remove extra upload.mak. Fix comment.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/libs/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/upload.mak | 34 |
3 files changed, 2 insertions, 36 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index da18206..f782512 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -8,4 +8,4 @@ SUBDIRS = $(DOCS_SUBDIRS) DIST_SUBDIRS = libs EXTRA_DIST = \ - upload.mak version.entities.in + version.entities.in diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 106e98d..55d9b89 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -6,7 +6,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj MODULE=gnonlin DOC_MODULE=$(MODULE) -# for upload.mak +# for upload-doc.mak DOC=$(MODULE) FORMATS=html html: html-build.stamp diff --git a/docs/upload.mak b/docs/upload.mak deleted file mode 100644 index ed01e5e..0000000 --- a/docs/upload.mak +++ /dev/null @@ -1,34 +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=freedesktop.org -DOC_BASE=/srv/gstreamer.freedesktop.org/www/data/doc -DOC_URL=$(DOC_SERVER):$(DOC_BASE) - - -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 |