gnomemm r1953 - cluttermm_tutorial/trunk

[daniel svn gnome org]

Author: daniel
Date: Tue Jan  6 20:32:15 2009
New Revision: 1953
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1953&view=rev

Log:
* Makefile.am (bin_PROGRAMS): Rename to noinst_PROGRAMS, or every
example executable will be installed as $(bindir)/example -- the
last one wins.  Do we want to install the example binaries, and if
so, where?
({,un}install-tutorial): Depend on docs/tutorial/html/index.html
rather than the phony target html, because the rule derives the
location of the html build directory from the first dependency.

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	Tue Jan  6 20:32:15 2009
@@ -26,7 +26,7 @@
 ACLOCAL_AMFLAGS  = -I m4 $(ACLOCAL_FLAGS)
 DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
 
-bin_PROGRAMS =	\
+noinst_PROGRAMS =	\
 	examples/actor/example			\
 	examples/actor_group/example		\
 	examples/actor_transformations/example	\
@@ -223,7 +223,7 @@
 
 tutorialdir = $(clutter_docdir)/tutorial/html
 
-install-tutorial: html docs/tutorial/style.css
+install-tutorial: docs/tutorial/html/index.html docs/tutorial/style.css
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(tutorialdir)
 	@dir='$(<D)'; for p in $$dir/*.html ; do \
@@ -233,7 +233,7 @@
 	done
 	$(INSTALL_DATA) $(srcdir)/docs/tutorial/style.css $(DESTDIR)$(tutorialdir)
 
-uninstall-tutorial: html docs/tutorial/style.css
+uninstall-tutorial: docs/tutorial/html/index.html docs/tutorial/style.css
 	@$(NORMAL_UNINSTALL)
 	@dir='$(<D)'; for p in $$dir/*.html ; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \