gcompris r3537 - in branches/gcomprixo: . src src/enumerate-activity/resources/enumerate src/enumerate-activity/resources/enumerate/food src/money-activity/resources src/money-activity/resources/money src/money-activity/resources/money/euro src/redraw-activity/resources src/redraw_symmetrical-activity/resources src/tuxpaint-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Sep 14 15:05:07 2008
New Revision: 3537
URL: http://svn.gnome.org/viewvc/gcompris?rev=3537&view=rev

Log:
	Added missing makefile that creates missing images.
	- fixes enumerate, money, redraw
	- removed tuxpaint activity, it is irrelevant on xo




Added:
   branches/gcomprixo/src/enumerate-activity/resources/enumerate/food/Makefile.am
   branches/gcomprixo/src/money-activity/resources/money/euro/Makefile.am
   branches/gcomprixo/src/redraw-activity/resources/Makefile.am
   branches/gcomprixo/src/redraw_symmetrical-activity/resources/Makefile.am
Removed:
   branches/gcomprixo/src/money-activity/resources/money/euro/p5e.jpg
   branches/gcomprixo/src/tuxpaint-activity/
Modified:
   branches/gcomprixo/ChangeLog
   branches/gcomprixo/configure.in
   branches/gcomprixo/src/Makefile.am
   branches/gcomprixo/src/bundleit.sh
   branches/gcomprixo/src/enumerate-activity/resources/enumerate/Makefile.am
   branches/gcomprixo/src/money-activity/resources/Makefile.am
   branches/gcomprixo/src/money-activity/resources/money/Makefile.am

Modified: branches/gcomprixo/configure.in
==============================================================================
--- branches/gcomprixo/configure.in	(original)
+++ branches/gcomprixo/configure.in	Sun Sep 14 15:05:07 2008
@@ -549,7 +549,6 @@
 gcompris-installer.nsi
 macosx/Makefile
 po/Makefile.in
-src/tuxpaint-activity/Makefile
 src/billard-activity/Makefile
 src/billard-activity/resources/Makefile
 src/billard-activity/resources/billard/Makefile
@@ -566,7 +565,7 @@
 src/memory_add_minus_mult_div_tux-activity/Makefile
 src/redraw_symmetrical-activity/Makefile
 src/redraw_symmetrical-activity/resources/Makefile
-src/redraw_symmetrical-activity/resources/redraw/Makefile
+src/redraw_symmetrical-activity/resources/redraw_symmetrical/Makefile
 src/gletters-activity/Makefile
 src/gletters-activity/resources/Makefile
 src/gletters-activity/resources/gletters/Makefile
@@ -643,12 +642,14 @@
 src/enumerate-activity/Makefile
 src/enumerate-activity/resources/Makefile
 src/enumerate-activity/resources/enumerate/Makefile
+src/enumerate-activity/resources/enumerate/food/Makefile
 src/pythontest-activity/Makefile
 src/gnumch-factors-activity/Makefile
 src/maze2DRelative-activity/Makefile
 src/money-activity/Makefile
 src/money-activity/resources/Makefile
 src/money-activity/resources/money/Makefile
+src/money-activity/resources/money/euro/Makefile
 src/algebra_plus-activity/Makefile
 src/crane-activity/Makefile
 src/crane-activity/resources/Makefile
@@ -701,7 +702,6 @@
 src/redraw-activity/Makefile
 src/redraw-activity/resources/Makefile
 src/redraw-activity/resources/redraw/Makefile
-src/redraw-activity/Makefile
 src/maze-activity/Makefile
 src/maze-activity/resources/Makefile
 src/maze-activity/resources/maze/Makefile

Modified: branches/gcomprixo/src/Makefile.am
==============================================================================
--- branches/gcomprixo/src/Makefile.am	(original)
+++ branches/gcomprixo/src/Makefile.am	Sun Sep 14 15:05:07 2008
@@ -108,5 +108,4 @@
 	searace1player-activity \
 	searace-activity \
 	sudoku-activity \
-	tuxpaint-activity \
 	watercycle-activity

Modified: branches/gcomprixo/src/bundleit.sh
==============================================================================
--- branches/gcomprixo/src/bundleit.sh	(original)
+++ branches/gcomprixo/src/bundleit.sh	Sun Sep 14 15:05:07 2008
@@ -80,13 +80,6 @@
   ERROR "  ERROR: Cannot find $activitysrc/init_path.sh"
 fi
 
-with_clock="--exclude resources/skins/gartoon/timers"
-has_timer=`egrep "gc_timer_display|timers/clock" $plugindir/../*.c`
-if test "$has_timer" != ""; then
-    echo "  Adding timers/clock files"
-    with_clock=""
-fi
-
 # Create the Sugar specific startup scripts
 activity_dir=${activity}.activity
 if [ -d $activity_dir ]
@@ -158,6 +151,16 @@
   ln -s ../boards/python/gcompris -t $activity_dir
 fi
 
+# Add the timers skin if needed (python activity don't use it)
+if [ "$haspyfile" = "" ]; then
+  with_clock="--exclude resources/skins/gartoon/timers"
+  has_timer=`egrep "gc_timer_display|timers/clock" $plugindir/../*.c`
+  if test "$has_timer" != ""; then
+    echo "  Adding timers/clock files"
+    with_clock=""
+  fi
+fi
+
 # Add the runit.sh script
 cp $activity_dir/../runit.sh $activity_dir
 

Modified: branches/gcomprixo/src/enumerate-activity/resources/enumerate/Makefile.am
==============================================================================
--- branches/gcomprixo/src/enumerate-activity/resources/enumerate/Makefile.am	(original)
+++ branches/gcomprixo/src/enumerate-activity/resources/enumerate/Makefile.am	Sun Sep 14 15:05:07 2008
@@ -1,3 +1,4 @@
+SUBDIRS = food
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/enumerate
 img_DATA = \
 	enumerate_answer_focus.png \

Added: branches/gcomprixo/src/enumerate-activity/resources/enumerate/food/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gcomprixo/src/enumerate-activity/resources/enumerate/food/Makefile.am	Sun Sep 14 15:05:07 2008
@@ -0,0 +1,23 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/enumerate/food
+img_DATA = \
+	README \
+	baby_bottle.png \
+	banana.png \
+	bread_slice.png \
+	butter.png \
+	chocolate.png \
+	chocolate_cake.png \
+	cookie.png \
+	french_croissant.png \
+	grapefruit.png \
+	marmelade.png \
+	milk_cup.png \
+	milk_shake.png \
+	orange.png \
+	pear.png \
+	round_cookie.png \
+	suggar_box.png \
+	yahourt.png
+
+EXTRA_DIST = $(img_DATA)
+

Modified: branches/gcomprixo/src/money-activity/resources/Makefile.am
==============================================================================
--- branches/gcomprixo/src/money-activity/resources/Makefile.am	(original)
+++ branches/gcomprixo/src/money-activity/resources/Makefile.am	Sun Sep 14 15:05:07 2008
@@ -1 +1,2 @@
-SUBDIRS = money
\ No newline at end of file
+SUBDIRS = money
+

Modified: branches/gcomprixo/src/money-activity/resources/money/Makefile.am
==============================================================================
--- branches/gcomprixo/src/money-activity/resources/money/Makefile.am	(original)
+++ branches/gcomprixo/src/money-activity/resources/money/Makefile.am	Sun Sep 14 15:05:07 2008
@@ -1,3 +1,4 @@
+SUBDIRS = euro
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/money
 img_DATA = \
 	apple.png \

Added: branches/gcomprixo/src/money-activity/resources/money/euro/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gcomprixo/src/money-activity/resources/money/euro/Makefile.am	Sun Sep 14 15:05:07 2008
@@ -0,0 +1,15 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/money
+img_DATA = \
+	c1c.png \
+	c1e.png \
+	c20c.png \
+	c2c.png \
+	c2e.png \
+	c50c.png \
+	c5c.png \
+	p10e.png \
+	p20e.png \
+	p50e.png \
+	p5e.png
+
+EXTRA_DIST = $(img_DATA)

Added: branches/gcomprixo/src/redraw-activity/resources/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gcomprixo/src/redraw-activity/resources/Makefile.am	Sun Sep 14 15:05:07 2008
@@ -0,0 +1 @@
+SUBDIRS=redraw
\ No newline at end of file

Added: branches/gcomprixo/src/redraw_symmetrical-activity/resources/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gcomprixo/src/redraw_symmetrical-activity/resources/Makefile.am	Sun Sep 14 15:05:07 2008
@@ -0,0 +1 @@
+SUBDIRS=redraw_symmetrical