gnomemm r1966 - cluttermm_tutorial/trunk

[daniel svn gnome org]

Author: daniel
Date: Wed Jan  7 12:20:53 2009
New Revision: 1966
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1966&view=rev

Log:
* Makefile.am: Minor cleanup.
(post-html): Prefix the examples directory with $(srcdir) because
the sources do not live in the build tree in a VPATH setup.  Also
make use of the -C option of rsync to omit build garbage from the
upload.

Modified:
   cluttermm_tutorial/trunk/ChangeLog
   cluttermm_tutorial/trunk/Makefile.am

Modified: cluttermm_tutorial/trunk/Makefile.am
==============================================================================
--- cluttermm_tutorial/trunk/Makefile.am	(original)
+++ cluttermm_tutorial/trunk/Makefile.am	Wed Jan  7 12:20:53 2009
@@ -158,6 +158,8 @@
 
 # The new XML DocBook way:
 XSLTPROC = xsltproc
+XMLLINT = xmllint
+DB2PDF = docbook2pdf
 
 docs/tutorial/html/index.html: docs/tutorial/cluttermm-tut-with-examples.xml
 	-rm -rf docs/tutorial/html
@@ -179,24 +181,21 @@
 	  $(DOCBOOK_STYLESHEET) $<
 
 validate-original: docs/tutorial/cluttermm-tut.xml
-	xmllint --xinclude --valid --noout --catalogs $(DOCBOOK_STYLESHEET) $<
+	$(XMLLINT) --xinclude --valid --noout --catalogs $(DOCBOOK_STYLESHEET) $<
 
 validate: docs/tutorial/cluttermm-tut-with-examples.xml
-	xmllint --xinclude --valid --noout --catalogs $(DOCBOOK_STYLESHEET) $<
+	$(XMLLINT) --xinclude --valid --noout --catalogs $(DOCBOOK_STYLESHEET) $<
 
 post-html: docs/tutorial/html/index.html docs/tutorial/style.css docs/tutorial/pdf/programming-with-cluttermm.pdf
 	rsync $(rsync_args) $(srcdir)/docs/tutorial/figures/*.png $$USER $(web_host):$(clutter_tut_path)/figures/
 	rsync $(rsync_args) $(srcdir)/docs/tutorial/icons/*.png $$USER $(web_host):$(clutter_tut_path)/icons/
-	rsync $(rsync_args) -r docs/tutorial/html/ $$USER $(web_host):$(clutter_tut_path)/html/
+	rsync $(rsync_args) -Cr docs/tutorial/html/ $$USER $(web_host):$(clutter_tut_path)/html/
 	rsync $(rsync_args) $(srcdir)/docs/tutorial/*.css $$USER $(web_host):$(clutter_tut_path)/html/
-	rsync $(rsync_args) -r docs/tutorial/pdf/ $$USER $(web_host):$(clutter_tut_path)/pdf/
-	rsync $(rsync_args) -r examples/ $$USER $(web_host):$(web_path)/examples/
+	rsync $(rsync_args) -Cr docs/tutorial/pdf/ $$USER $(web_host):$(clutter_tut_path)/pdf/
+	rsync $(rsync_args) -Cr $(srcdir)/examples/ --exclude '*/example' $$USER $(web_host):$(web_path)/examples/
 
 # PDF Generation:
 
-XMLLINT = xmllint
-DB2PDF = docbook2pdf
-
 # we need to produce a version with full examples with all of the XIncludes done so that it
 # can processed for PDF
 docs/tutorial/programming-with-cluttermm.xml: docs/tutorial/cluttermm-tut-with-examples.xml
@@ -240,7 +239,7 @@
 	  rm -f $(DESTDIR)$(tutorialdir)/$$f; \
 	done
 	rm -f $(DESTDIR)$(tutorialdir)/style.css
-	rm -f $(DESTDIR)$(tutorialdir)/icons
+	rm -rf $(DESTDIR)$(tutorialdir)/icons
 
 all-local: html
 
@@ -250,4 +249,4 @@
 
 maintainer-clean-local: doc-clean
 
-.PHONY: post-html doc-clean install-tutorial uninstall-tutorial validate validate-original
+.PHONY: post-html doc-clean doc-rebuild install-tutorial uninstall-tutorial validate validate-original