seed r728 - in trunk: . examples examples/browser examples/clutter-shader examples/glib examples/turtle

[hortont svn gnome org]

Author: hortont
Date: Wed Jan 14 20:07:57 2009
New Revision: 728
URL: http://svn.gnome.org/viewvc/seed?rev=728&view=rev

Log:
Fix toggleable example installation.


Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/examples/Makefile.am
   trunk/examples/browser/Makefile.am
   trunk/examples/clutter-shader/Makefile.am
   trunk/examples/glib/Makefile.am
   trunk/examples/turtle/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jan 14 20:07:57 2009
@@ -6,11 +6,8 @@
 	extensions \
 	doc \
 	modules \
-	tests
-
-if BUILD_SEED_EXAMPLES
-SUBDIRS += examples
-endif
+	tests \
+	examples
 
 seeddocdir = ${prefix}/share/doc/seed
 seeddoc_DATA = \

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Jan 14 20:07:57 2009
@@ -154,7 +154,7 @@
 			  AC_HELP_STRING([--enable-examples],
 							 [install JavaScript examples. [default=yes]]),
 			  [enable_examples=$enableval],[enable_examples="yes"])
-AM_CONDITIONAL([BUILD_SEED_EXAMPLES], [test "x$enable_examples"="xyes"])
+AM_CONDITIONAL(BUILD_SEED_EXAMPLES, test "x$enable_examples" = "xyes")
 
 dnl =============================Debug=========================================
 AC_ARG_ENABLE(debug,

Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am	(original)
+++ trunk/examples/Makefile.am	Wed Jan 14 20:07:57 2009
@@ -4,6 +4,7 @@
           browser \
           turtle
 
+if BUILD_SEED_EXAMPLES
 examplesdir=$(datadir)/doc/seed/examples
 examples_DATA = \
 	actions.js \
@@ -31,6 +32,8 @@
 	vte-test.js \
 	threaded-repl.js \
 	HACKING
+endif
+
 EXTRA_DIST = \
 	COPYING \
 	actions.js \

Modified: trunk/examples/browser/Makefile.am
==============================================================================
--- trunk/examples/browser/Makefile.am	(original)
+++ trunk/examples/browser/Makefile.am	Wed Jan 14 20:07:57 2009
@@ -1,3 +1,4 @@
+if BUILD_SEED_EXAMPLES
 browserdir = $(datadir)/doc/seed/examples/browser
 browser_DATA = \
 	browser-actions.js \
@@ -9,6 +10,8 @@
 	browser-toolbar.js \
 	COPYING \
 	main.js
+endif
+
 EXTRA_DIST = \
 	browser-actions.js \
 	browser-bookmarks.js \

Modified: trunk/examples/clutter-shader/Makefile.am
==============================================================================
--- trunk/examples/clutter-shader/Makefile.am	(original)
+++ trunk/examples/clutter-shader/Makefile.am	Wed Jan 14 20:07:57 2009
@@ -1,9 +1,12 @@
+if BUILD_SEED_EXAMPLES
 shaderdir = $(datadir)/doc/seed/examples/clutter-shader
 shader_DATA = \
 	bob.jpg \
 	default.glsl \
 	main.js \
 	ShaderView.js
+endif
+
 EXTRA_DIST = \
 	bob.jpg \
 	default.glsl \

Modified: trunk/examples/glib/Makefile.am
==============================================================================
--- trunk/examples/glib/Makefile.am	(original)
+++ trunk/examples/glib/Makefile.am	Wed Jan 14 20:07:57 2009
@@ -1,9 +1,12 @@
+if BUILD_SEED_EXAMPLES
 glibdir=$(datadir)/doc/seed/examples/glib
 glib_DATA = \
 	env.js \
 	thread.js \
 	timeout.js \
 	timer.js
+endif
+
 EXTRA_DIST = \
 	env.js \
 	thread.js \

Modified: trunk/examples/turtle/Makefile.am
==============================================================================
--- trunk/examples/turtle/Makefile.am	(original)
+++ trunk/examples/turtle/Makefile.am	Wed Jan 14 20:07:57 2009
@@ -1,3 +1,4 @@
+if BUILD_SEED_EXAMPLES
 if BUILD_TURTLE_EXAMPLE
 
 AM_CPPFLAGS = \
@@ -19,3 +20,4 @@
 	-lseed
 
 endif
+endif