From 3795e5a571e02ef9fb518f070a51d63905f3614f Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 29 Apr 2006 00:36:47 +0000 Subject: [PATCH] move upload.mak to common Original commit message from CVS: * common/Makefile.am: * docs/Makefile.am: * docs/faq/Makefile.am: * docs/gst/Makefile.am: * docs/libs/Makefile.am: * docs/manual/Makefile.am: * docs/plugins/Makefile.am: * docs/pwg/Makefile.am: * docs/slides/Makefile.am: * docs/upload.mak: * common/upload.mak: move upload.mak to common --- ChangeLog | 15 +++++++++++++++ common | 2 +- docs/Makefile.am | 2 +- docs/faq/Makefile.am | 2 +- docs/gst/Makefile.am | 2 +- docs/libs/Makefile.am | 2 +- docs/manual/Makefile.am | 2 +- docs/plugins/Makefile.am | 2 +- docs/pwg/Makefile.am | 2 +- docs/slides/Makefile.am | 1 - docs/upload.mak | 34 ---------------------------------- 11 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 docs/upload.mak diff --git a/ChangeLog b/ChangeLog index 215604e..502a655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2006-04-29 Thomas Vander Stichele + * common/Makefile.am: + * docs/Makefile.am: + * docs/faq/Makefile.am: + * docs/gst/Makefile.am: + * docs/libs/Makefile.am: + * docs/manual/Makefile.am: + * docs/plugins/Makefile.am: + * docs/pwg/Makefile.am: + * docs/slides/Makefile.am: + * docs/upload.mak: + * common/upload.mak: + move upload.mak to common + +2006-04-29 Thomas Vander Stichele + * tests/check/gst/gstghostpad.c: (GST_START_TEST): add more asserts on refcounts do more cleanup at end of tests diff --git a/common b/common index a6710e6..6b67aa6 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a6710e67fd82147e32a18f1b63177583faffd498 +Subproject commit 6b67aa6dd111fb139e1be0f6a386e3ff84cce091 diff --git a/docs/Makefile.am b/docs/Makefile.am index 3e5103a..6cf75c6 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -16,7 +16,7 @@ SUBDIRS = design $(SUBDIRS_DOCBOOK) $(SUBDIRS_GTK_DOC) DIST_SUBDIRS = design gst libs plugins faq manual pwg slides xsl EXTRA_DIST = \ - manuals.mak htmlinstall.mak upload.mak \ + manuals.mak htmlinstall.mak \ image-png image-pdf image-eps url.entities version.entities.in upload: diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am index 58d3070..535c696 100644 --- a/docs/faq/Makefile.am +++ b/docs/faq/Makefile.am @@ -24,7 +24,7 @@ EXTRA_SRC = gst-uninstalled # get the generic docbuilding Makefile stuff include $(srcdir)/../manuals.mak # get the generic upload target -include $(srcdir)/../upload.mak +include $(top_srcdir)/common/upload.mak ### this is standard automake stuff diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am index b74f2a9..bf21d79 100644 --- a/docs/gst/Makefile.am +++ b/docs/gst/Makefile.am @@ -10,7 +10,7 @@ BUILT_SOURCES=gstreamer.types DOC=gstreamer FORMATS=html html: html-build.stamp -include $(srcdir)/../upload.mak +include $(top_srcdir)/common/upload.mak # generated basefiles #basefiles = \ diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 2d7b3ea..0463e72 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -8,7 +8,7 @@ DOC_MODULE=gstreamer-libs DOC=gstreamer-libs FORMATS=html html: html-build.stamp -include $(srcdir)/../upload.mak +include $(top_srcdir)/common/upload.mak # generated basefiles #basefiles = \ diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am index dacb1b3..406588e 100644 --- a/docs/manual/Makefile.am +++ b/docs/manual/Makefile.am @@ -27,7 +27,7 @@ EXTRA_SRC = # get the generic docbuilding Makefile stuff include $(srcdir)/../manuals.mak # get the generic upload target -include $(srcdir)/../upload.mak +include $(top_srcdir)/common/upload.mak ### this is standard automake stuff diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 8bfa8cf..6199de7 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/pwg/Makefile.am b/docs/pwg/Makefile.am index af7aadb..52b4f59 100644 --- a/docs/pwg/Makefile.am +++ b/docs/pwg/Makefile.am @@ -24,7 +24,7 @@ EXTRA_SRC = # get the generic docbuilding Makefile stuff include $(srcdir)/../manuals.mak # get the generic upload target -include $(srcdir)/../upload.mak +include $(top_srcdir)/common/upload.mak ### this is standard automake stuff diff --git a/docs/slides/Makefile.am b/docs/slides/Makefile.am index 793a47b..d2b1c58 100644 --- a/docs/slides/Makefile.am +++ b/docs/slides/Makefile.am @@ -1,2 +1 @@ EXTRA_DIST = abstract abstract.save outline README slides - diff --git a/docs/upload.mak b/docs/upload.mak deleted file mode 100644 index 502fc9b..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=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 -- 2.7.4