From 9d1432ee56d78effbbc17dedb7fd5aa990276031 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 21:09:48 +0200 Subject: [PATCH 01/22] Remove new activities before creating new Makefiles. --- configure.ac | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index da13ea380..43adf03ad 100644 --- a/configure.ac +++ b/configure.ac @@ -518,7 +518,7 @@ AC_SUBST(CFLAGS) AC_SUBST(LIBS) dnl Autoconf output -AC_OUTPUT([ src/piano_player-activity/Makefile src/name_identification-activity-activity/Makefile src/note_names-activity/Makefile src/world_music-activity/Makefile src/explore_world_template-activity/Makefile src/world_explore_template-activity/Makefile src/intro_gravity-activity/Makefile src/explore_world_music-activity/Makefile src/explore-activity/Makefile src/explore-activity/Makefile src/explore_world_animals-activity/Makefile src/new-activity/Makefile src/explore_world_animals-activity/Makefile src/explore_world_animals-activity/Makefile src/play_piano-activity/Makefile src/play_rhythm-activity/Makefile src/piano_composition-activity/Makefile src/explore_farm_animals-activity/Makefile src/explore_farm_animals-activity/Makefile src/justtesting-activity/Makefile +AC_OUTPUT([ Makefile Makefile.mingw autopackage/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 2669da1e5..866b949cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ install-activity: for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || break 0; done -SUBDIRS = justtesting-activity explore_farm_animals-activity explore_farm_animals-activity piano_composition-activity play_rhythm-activity play_piano-activity got_rhythm-activity explore_world_animals-activity explore_world_animals-activity new-activity explore_world_animals-activity explore-activity explore-activity explore_world_music-activity intro_gravity-activity world_explore_template-activity explore_world_template-activity world_music-activity note_names-activity name_identification-activity-activity piano_player-activity \ +SUBDIRS = \ administration-activity \ advanced_colors-activity \ algebra_by-activity \ From d37e8ca90c61b2b25cead1777fa810477e02abf4 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 21:43:34 +0200 Subject: [PATCH 02/22] Temporary solution: solve geography build problem. --- src/geography-activity/resources/geography/europe/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/geography-activity/resources/geography/europe/Makefile.am b/src/geography-activity/resources/geography/europe/Makefile.am index 78da30a34..18282b6c1 100644 --- a/src/geography-activity/resources/geography/europe/Makefile.am +++ b/src/geography-activity/resources/geography/europe/Makefile.am @@ -31,8 +31,7 @@ img_DATA = \ portugal.png \ romania.png \ russia.png \ - serbia.png \ - montenegro.png \ + serbia_montenegro.png \ slovakia.png \ slovenia.png \ spain.png \ From a2ec4940848cc89f2183923a841dfb9b4964a58c Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 21:44:03 +0200 Subject: [PATCH 03/22] Add explore activity build files. --- src/explore-activity/Makefile.am | 10 ++++++++++ src/explore-activity/resources/explore/Makefile.am | 14 ++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 src/explore-activity/Makefile.am create mode 100644 src/explore-activity/resources/explore/Makefile.am diff --git a/src/explore-activity/Makefile.am b/src/explore-activity/Makefile.am new file mode 100644 index 000000000..1225c60d7 --- /dev/null +++ b/src/explore-activity/Makefile.am @@ -0,0 +1,10 @@ +# Passthrough, do not break uplevel make rule +install-activity: + +SUBDIRS = resources + +pythondir = $(PYTHON_PLUGIN_DIR) + +dist_python_DATA= explore.py + +EXTRA_DIST = init_path.sh diff --git a/src/explore-activity/resources/explore/Makefile.am b/src/explore-activity/resources/explore/Makefile.am new file mode 100644 index 000000000..680067c80 --- /dev/null +++ b/src/explore-activity/resources/explore/Makefile.am @@ -0,0 +1,14 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore +img_DATA = \ + border.png \ + defaultCompletedLocationPic.png \ + defaultLocationPic.png \ + default.png \ + happyFace.png \ + playbutton.png \ + ribbon.png \ + sadFace.png \ + star.png \ + winner.png + +EXTRA_DIST = $(img_DATA) From 770a9ab75d1b495b5eb8177675af43ce2073a200 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 21:44:30 +0200 Subject: [PATCH 04/22] Build explore activity. --- configure.ac | 3 +++ src/Makefile.am | 1 + 2 files changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 43adf03ad..85c9596af 100644 --- a/configure.ac +++ b/configure.ac @@ -656,6 +656,9 @@ src/erase-activity/resources/Makefile src/erase-activity/resources/erase/Makefile src/erase_2clic-activity/Makefile src/erase_clic-activity/Makefile +src/explore-activity/Makefile +src/explore-activity/resources/Makefile +src/explore-activity/resources/explore/Makefile src/fifteen-activity/Makefile src/fifteen-activity/resources/Makefile src/fifteen-activity/resources/fifteen/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 866b949cf..6a7a0533a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,6 +45,7 @@ SUBDIRS = \ erase-activity \ erase_2clic-activity \ erase_clic-activity \ + explore-activity \ fifteen-activity \ findit-activity \ followline-activity \ From 252a213f4fd82bd24b311b0d613ceedf7e101ac2 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 21:51:19 +0200 Subject: [PATCH 05/22] Added note_names activity build files. --- src/note_names-activity/.gitignore | 1 + src/note_names-activity/Makefile.am | 35 +++++++++++++++++++ src/note_names-activity/resources/Makefile.am | 2 -- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 src/note_names-activity/.gitignore create mode 100644 src/note_names-activity/Makefile.am delete mode 100644 src/note_names-activity/resources/Makefile.am diff --git a/src/note_names-activity/.gitignore b/src/note_names-activity/.gitignore new file mode 100644 index 000000000..11f761474 --- /dev/null +++ b/src/note_names-activity/.gitignore @@ -0,0 +1 @@ +note_names.xml diff --git a/src/note_names-activity/Makefile.am b/src/note_names-activity/Makefile.am new file mode 100644 index 000000000..0e23af6e7 --- /dev/null +++ b/src/note_names-activity/Makefile.am @@ -0,0 +1,35 @@ +# Passthrough, do not break uplevel make rule +install-activity: + +SUBDIRS = + +pythondir = $(PYTHON_PLUGIN_DIR) + +dist_python_DATA= note_names.py + + + +xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@ + +xml_in_files = \ + note_names.xml.in + + +xml_DATA = $(xml_in_files:.xml.in=.xml) + +# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations +# in the file themselves. GCompris pick the translations from the po file at +# runtime. +# +$(xml_DATA): %.xml: %.xml.in + sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@ + +# Use this directive and instead of the one above to embed the translations +# in the xml files directly, this is needed for the tool gcompris2spip +#@INTLTOOL_XML_RULE@ + +icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@ +icon_DATA = note_names.svg + +EXTRA_DIST = $(icon_DATA) ${xml_in_files} init_path.sh +CLEANFILES = $(xml_DATA) diff --git a/src/note_names-activity/resources/Makefile.am b/src/note_names-activity/resources/Makefile.am deleted file mode 100644 index ecdf9300c..000000000 --- a/src/note_names-activity/resources/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = note_names - From a92e3eb588769a2991ea96ff0002f87ea0ea8391 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 21:51:41 +0200 Subject: [PATCH 06/22] Build note_names activity. --- configure.ac | 1 + src/Makefile.am | 1 + 2 files changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 85c9596af..a563a73c6 100644 --- a/configure.ac +++ b/configure.ac @@ -795,6 +795,7 @@ src/money_cents-activity/Makefile src/mosaic-activity/Makefile src/mosaic-activity/resources/Makefile src/mosaic-activity/resources/mosaic/Makefile +src/note_names-activity/Makefile src/paintings-activity/Makefile src/paintings-activity/resources/Makefile src/paintings-activity/resources/paintings/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 6a7a0533a..a0d4eaae8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,6 +105,7 @@ SUBDIRS = \ money_back_cents-activity \ money_cents-activity \ mosaic-activity \ + note_names-activity \ paintings-activity \ paratrooper-activity \ penalty-activity \ From e0c2c8549f2e378de51c4aec5cfc51066db053d3 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 22:06:08 +0200 Subject: [PATCH 07/22] Added piano_composition build files, and modified existing one to include resources. --- src/piano_composition-activity/Makefile.am | 4 +-- .../resources/piano_composition/Makefile.am | 26 +++++++++++++++++++ .../bass_pitches/1/Makefile.am | 18 +++++++++++++ .../bass_pitches/2/Makefile.am | 18 +++++++++++++ .../bass_pitches/4/Makefile.am | 18 +++++++++++++ .../bass_pitches/8/Makefile.am | 18 +++++++++++++ .../bass_pitches/Makefile.am | 1 + .../piano_composition/buttons/Makefile.am | 12 +++++++++ .../playActivities/Makefile.am | 10 +++++++ .../playActivities/background/Makefile.am | 11 ++++++++ .../treble_pitches/1/Makefile.am | 18 +++++++++++++ .../treble_pitches/2/Makefile.am | 18 +++++++++++++ .../treble_pitches/4/Makefile.am | 18 +++++++++++++ .../treble_pitches/8/Makefile.am | 18 +++++++++++++ .../treble_pitches/Makefile.am | 1 + 15 files changed, 207 insertions(+), 2 deletions(-) create mode 100644 src/piano_composition-activity/resources/piano_composition/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/bass_pitches/1/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/bass_pitches/2/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/bass_pitches/4/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/bass_pitches/8/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/bass_pitches/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/buttons/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/playActivities/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/treble_pitches/1/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/treble_pitches/2/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/treble_pitches/4/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/treble_pitches/8/Makefile.am create mode 100644 src/piano_composition-activity/resources/piano_composition/treble_pitches/Makefile.am diff --git a/src/piano_composition-activity/Makefile.am b/src/piano_composition-activity/Makefile.am index c7f11fc48..87099bc85 100644 --- a/src/piano_composition-activity/Makefile.am +++ b/src/piano_composition-activity/Makefile.am @@ -1,11 +1,11 @@ # Passthrough, do not break uplevel make rule install-activity: -SUBDIRS = +SUBDIRS = resources pythondir = $(PYTHON_PLUGIN_DIR) -dist_python_DATA= piano_composition.py +dist_python_DATA= piano_composition.py gcomprismusic.py diff --git a/src/piano_composition-activity/resources/piano_composition/Makefile.am b/src/piano_composition-activity/resources/piano_composition/Makefile.am new file mode 100644 index 000000000..708119998 --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/Makefile.am @@ -0,0 +1,26 @@ +SUBDIRS = bass_pitches buttons playActivities treble_pitches + +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition +img_DATA = \ + bassClef.png \ + blackflat.png \ + blacksharp.png \ + eighthNote.png \ + flag.png \ + halfNote.png \ + happyNote.png \ + keyboard.png \ + load.png \ + melodies.txt \ + note_highlight.png \ + quarterNote.png \ + sadNote.png \ + save.png \ + tool-load.png \ + tool-save.png \ + trebleClef.png \ + wholeNote.png + + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/bass_pitches/1/Makefile.am b/src/piano_composition-activity/resources/piano_composition/bass_pitches/1/Makefile.am new file mode 100644 index 000000000..f6d11a081 --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/bass_pitches/1/Makefile.am @@ -0,0 +1,18 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/bass_pitches/1 +img_DATA = \ + \-1.wav \ + 1.wav \ + \-2.wav \ + 2.wav \ + \-3.wav \ + 3.wav \ + \-4.wav \ + 4.wav \ + \-5.wav \ + 5.wav \ + 6.wav \ + 7.wav \ + 8.wav + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/bass_pitches/2/Makefile.am b/src/piano_composition-activity/resources/piano_composition/bass_pitches/2/Makefile.am new file mode 100644 index 000000000..8c146b4dd --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/bass_pitches/2/Makefile.am @@ -0,0 +1,18 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/bass_pitches/2 +img_DATA = \ + \-1.wav \ + 1.wav \ + \-2.wav \ + 2.wav \ + \-3.wav \ + 3.wav \ + \-4.wav \ + 4.wav \ + \-5.wav \ + 5.wav \ + 6.wav \ + 7.wav \ + 8.wav + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/bass_pitches/4/Makefile.am b/src/piano_composition-activity/resources/piano_composition/bass_pitches/4/Makefile.am new file mode 100644 index 000000000..68d11aceb --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/bass_pitches/4/Makefile.am @@ -0,0 +1,18 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/bass_pitches/4 +img_DATA = \ + \-1.wav \ + 1.wav \ + \-2.wav \ + 2.wav \ + \-3.wav \ + 3.wav \ + \-4.wav \ + 4.wav \ + \-5.wav \ + 5.wav \ + 6.wav \ + 7.wav \ + 8.wav + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/bass_pitches/8/Makefile.am b/src/piano_composition-activity/resources/piano_composition/bass_pitches/8/Makefile.am new file mode 100644 index 000000000..6054484e4 --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/bass_pitches/8/Makefile.am @@ -0,0 +1,18 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/bass_pitches/8 +img_DATA = \ + \-1.wav \ + 1.wav \ + \-2.wav \ + 2.wav \ + \-3.wav \ + 3.wav \ + \-4.wav \ + 4.wav \ + \-5.wav \ + 5.wav \ + 6.wav \ + 7.wav \ + 8.wav + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/bass_pitches/Makefile.am b/src/piano_composition-activity/resources/piano_composition/bass_pitches/Makefile.am new file mode 100644 index 000000000..a0b997e9f --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/bass_pitches/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = 1 2 4 8 diff --git a/src/piano_composition-activity/resources/piano_composition/buttons/Makefile.am b/src/piano_composition-activity/resources/piano_composition/buttons/Makefile.am new file mode 100644 index 000000000..e0a619286 --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/buttons/Makefile.am @@ -0,0 +1,12 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/buttons +img_DATA = \ + brown.png \ + darkpurple.png \ + gray.png \ + green.png \ + purple.png \ + red.png \ + teal.png + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/playActivities/Makefile.am b/src/piano_composition-activity/resources/piano_composition/playActivities/Makefile.am new file mode 100644 index 000000000..c5c27d4c4 --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/playActivities/Makefile.am @@ -0,0 +1,10 @@ +SUBDIRS = background + +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/playActivities +img_DATA = \ + erase.png \ + playbutton.png + + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile.am b/src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile.am new file mode 100644 index 000000000..847c99684 --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile.am @@ -0,0 +1,11 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/playActivities/background +img_DATA = \ + 1.png \ + 2.png \ + 3.png \ + 4.png \ + 5.png \ + 6.png + + +EXTRA_DIST = $(img_DATA) diff --git a/src/piano_composition-activity/resources/piano_composition/treble_pitches/1/Makefile.am b/src/piano_composition-activity/resources/piano_composition/treble_pitches/1/Makefile.am new file mode 100644 index 000000000..6ff10cfe8 --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/treble_pitches/1/Makefile.am @@ -0,0 +1,18 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/treble_pitches/1 +img_DATA = \ + \-1.wav \ + 1.wav \ + \-2.wav \ + 2.wav \ + \-3.wav \ + 3.wav \ + \-4.wav \ + 4.wav \ + \-5.wav \ + 5.wav \ + 6.wav \ + 7.wav \ + 8.wav + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/treble_pitches/2/Makefile.am b/src/piano_composition-activity/resources/piano_composition/treble_pitches/2/Makefile.am new file mode 100644 index 000000000..b99e3673d --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/treble_pitches/2/Makefile.am @@ -0,0 +1,18 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/treble_pitches/2 +img_DATA = \ + \-1.wav \ + 1.wav \ + \-2.wav \ + 2.wav \ + \-3.wav \ + 3.wav \ + \-4.wav \ + 4.wav \ + \-5.wav \ + 5.wav \ + 6.wav \ + 7.wav \ + 8.wav + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/treble_pitches/4/Makefile.am b/src/piano_composition-activity/resources/piano_composition/treble_pitches/4/Makefile.am new file mode 100644 index 000000000..1152ddd8e --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/treble_pitches/4/Makefile.am @@ -0,0 +1,18 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/treble_pitches/4 +img_DATA = \ + \-1.wav \ + 1.wav \ + \-2.wav \ + 2.wav \ + \-3.wav \ + 3.wav \ + \-4.wav \ + 4.wav \ + \-5.wav \ + 5.wav \ + 6.wav \ + 7.wav \ + 8.wav + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/treble_pitches/8/Makefile.am b/src/piano_composition-activity/resources/piano_composition/treble_pitches/8/Makefile.am new file mode 100644 index 000000000..65bcc1d8e --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/treble_pitches/8/Makefile.am @@ -0,0 +1,18 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/treble_pitches/8 +img_DATA = \ + \-1.wav \ + 1.wav \ + \-2.wav \ + 2.wav \ + \-3.wav \ + 3.wav \ + \-4.wav \ + 4.wav \ + \-5.wav \ + 5.wav \ + 6.wav \ + 7.wav \ + 8.wav + +EXTRA_DIST = $(img_DATA) + diff --git a/src/piano_composition-activity/resources/piano_composition/treble_pitches/Makefile.am b/src/piano_composition-activity/resources/piano_composition/treble_pitches/Makefile.am new file mode 100644 index 000000000..a0b997e9f --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/treble_pitches/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = 1 2 4 8 From ca7834aa100b0803edc19c00d03493db995fb2d3 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 22:06:29 +0200 Subject: [PATCH 08/22] Build piano_composition activity. --- configure.ac | 16 ++++++++++++++++ src/Makefile.am | 1 + 2 files changed, 17 insertions(+) diff --git a/configure.ac b/configure.ac index a563a73c6..9f40731cf 100644 --- a/configure.ac +++ b/configure.ac @@ -808,6 +808,22 @@ src/penalty-activity/resources/penalty/Makefile src/photohunter-activity/Makefile src/photohunter-activity/resources/Makefile src/photohunter-activity/resources/photohunter/Makefile +src/piano_composition-activity/Makefile +src/piano_composition-activity/resources/Makefile +src/piano_composition-activity/resources/piano_composition/Makefile +src/piano_composition-activity/resources/piano_composition/bass_pitches/Makefile +src/piano_composition-activity/resources/piano_composition/bass_pitches/1/Makefile +src/piano_composition-activity/resources/piano_composition/bass_pitches/2/Makefile +src/piano_composition-activity/resources/piano_composition/bass_pitches/4/Makefile +src/piano_composition-activity/resources/piano_composition/bass_pitches/8/Makefile +src/piano_composition-activity/resources/piano_composition/buttons/Makefile +src/piano_composition-activity/resources/piano_composition/playActivities/Makefile +src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile +src/piano_composition-activity/resources/piano_composition/treble_pitches/Makefile +src/piano_composition-activity/resources/piano_composition/treble_pitches/1/Makefile +src/piano_composition-activity/resources/piano_composition/treble_pitches/2/Makefile +src/piano_composition-activity/resources/piano_composition/treble_pitches/4/Makefile +src/piano_composition-activity/resources/piano_composition/treble_pitches/8/Makefile src/planegame-activity/Makefile src/planegame-activity/resources/Makefile src/planegame-activity/resources/planegame/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a0d4eaae8..cb3f8cad5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -110,6 +110,7 @@ SUBDIRS = \ paratrooper-activity \ penalty-activity \ photohunter-activity \ + piano_composition-activity \ planegame-activity \ pythontemplate-activity \ pythontest-activity \ From 93e610f8609fe128535a9fb003331b40ab35dacb Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 22:12:19 +0200 Subject: [PATCH 09/22] Added/modified play_rhythm activity build files. --- src/play_rhythm-activity/Makefile.am | 2 +- .../resources/play_rhythm/Makefile.am | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/play_rhythm-activity/resources/play_rhythm/Makefile.am diff --git a/src/play_rhythm-activity/Makefile.am b/src/play_rhythm-activity/Makefile.am index 4041ef400..a6eac028e 100644 --- a/src/play_rhythm-activity/Makefile.am +++ b/src/play_rhythm-activity/Makefile.am @@ -1,7 +1,7 @@ # Passthrough, do not break uplevel make rule install-activity: -SUBDIRS = +SUBDIRS = resources pythondir = $(PYTHON_PLUGIN_DIR) diff --git a/src/play_rhythm-activity/resources/play_rhythm/Makefile.am b/src/play_rhythm-activity/resources/play_rhythm/Makefile.am new file mode 100644 index 000000000..6ff466c1d --- /dev/null +++ b/src/play_rhythm-activity/resources/play_rhythm/Makefile.am @@ -0,0 +1,9 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/play_rhythm +img_DATA = \ + click-old1.wav \ + click.wav \ + drumhead.png \ + metronome.png \ + record.png + +EXTRA_DIST = $(img_DATA) From 133db54a52e4620a5193156b3810afd7e53874ba Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 22:16:35 +0200 Subject: [PATCH 10/22] Build play_rythm activity --- configure.ac | 3 +++ src/Makefile.am | 1 + 2 files changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 9f40731cf..00dc6acb3 100644 --- a/configure.ac +++ b/configure.ac @@ -827,6 +827,9 @@ src/piano_composition-activity/resources/piano_composition/treble_pitches/8/Make src/planegame-activity/Makefile src/planegame-activity/resources/Makefile src/planegame-activity/resources/planegame/Makefile +src/play_rhythm-activity/Makefile +src/play_rhythm-activity/resources/Makefile +src/play_rhythm-activity/resources/play_rhythm/Makefile src/pythontemplate-activity/Makefile src/pythontest-activity/Makefile src/railroad-activity/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index cb3f8cad5..905588f4f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,6 +112,7 @@ SUBDIRS = \ photohunter-activity \ piano_composition-activity \ planegame-activity \ + play_rhythm-activity \ pythontemplate-activity \ pythontest-activity \ railroad-activity \ From 4af6dcdd30c77964c8a9c046774642414b8f5610 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 14 Aug 2012 22:20:47 +0200 Subject: [PATCH 11/22] Build play_piano activity. --- configure.ac | 1 + src/Makefile.am | 1 + 2 files changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 00dc6acb3..407c38b57 100644 --- a/configure.ac +++ b/configure.ac @@ -827,6 +827,7 @@ src/piano_composition-activity/resources/piano_composition/treble_pitches/8/Make src/planegame-activity/Makefile src/planegame-activity/resources/Makefile src/planegame-activity/resources/planegame/Makefile +src/play_piano-activity/Makefile src/play_rhythm-activity/Makefile src/play_rhythm-activity/resources/Makefile src/play_rhythm-activity/resources/play_rhythm/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 905588f4f..763e04ae9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,6 +112,7 @@ SUBDIRS = \ photohunter-activity \ piano_composition-activity \ planegame-activity \ + play_piano-activity \ play_rhythm-activity \ pythontemplate-activity \ pythontest-activity \ From 518ed3966d7c71b27041a533115c6f3284b27f66 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Mon, 20 Aug 2012 22:53:43 +0200 Subject: [PATCH 12/22] Install the eggs in the nest and hope easter will come. --- .../resources/piano_composition/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/piano_composition-activity/resources/piano_composition/Makefile.am b/src/piano_composition-activity/resources/piano_composition/Makefile.am index 708119998..fd5585360 100644 --- a/src/piano_composition-activity/resources/piano_composition/Makefile.am +++ b/src/piano_composition-activity/resources/piano_composition/Makefile.am @@ -2,16 +2,20 @@ SUBDIRS = bass_pitches buttons playActivities treble_pitches imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition img_DATA = \ + bach.png \ + banana.png \ bassClef.png \ blackflat.png \ blacksharp.png \ eighthNote.png \ flag.png \ + gsoc2012.png \ halfNote.png \ happyNote.png \ keyboard.png \ load.png \ melodies.txt \ + mozart.png \ note_highlight.png \ quarterNote.png \ sadNote.png \ From 6fa20bcccd2ca16e9114861a7ec666fbd5324e5d Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 21 Aug 2012 23:44:05 +0200 Subject: [PATCH 13/22] Temporary solution: install melodies.desktop.in --- .../resources/piano_composition/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/piano_composition-activity/resources/piano_composition/Makefile.am b/src/piano_composition-activity/resources/piano_composition/Makefile.am index fd5585360..a4819827e 100644 --- a/src/piano_composition-activity/resources/piano_composition/Makefile.am +++ b/src/piano_composition-activity/resources/piano_composition/Makefile.am @@ -14,7 +14,7 @@ img_DATA = \ happyNote.png \ keyboard.png \ load.png \ - melodies.txt \ + melodies.desktop.in \ mozart.png \ note_highlight.png \ quarterNote.png \ From 06dc2a6fb7e797858dbaffddbd25d050c5c04caa Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 21 Aug 2012 23:44:47 +0200 Subject: [PATCH 14/22] Use path relative to gcompris installation (and not gcompris source) --- src/explore-activity/explore.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/explore-activity/explore.py b/src/explore-activity/explore.py index f70231114..738504baa 100644 --- a/src/explore-activity/explore.py +++ b/src/explore-activity/explore.py @@ -43,7 +43,11 @@ RECORD_LOCATIONS = False # ----------------------------------------------------------------------------- -ExploreActivityResourcesFilepath = '..//src/explore-activity/resources/explore/' +ExploreActivityResourcesFilepath = "%s/explore/" % gcompris.DATA_DIR + +#Uncomment following line to run gcompris in the build folder. +#ExploreActivityResourcesFilepath = '..//src/explore-activity/resources/explore/' + class Gcompris_explore: def __init__(self, gcomprisBoard): From 323f8a6d065544dedfee77fdebc905b0da08710e Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 21 Aug 2012 23:46:14 +0200 Subject: [PATCH 15/22] Updated explore world music build files. Temporary solution: install content.desktop.in. Final solution is to create content.desktop and have the explore activity read this new file. --- src/explore_world_music-activity/Makefile.am | 8 +----- .../resources/explore_world_music/Makefile.am | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 src/explore_world_music-activity/resources/explore_world_music/Makefile.am diff --git a/src/explore_world_music-activity/Makefile.am b/src/explore_world_music-activity/Makefile.am index 5cba9993b..775452453 100644 --- a/src/explore_world_music-activity/Makefile.am +++ b/src/explore_world_music-activity/Makefile.am @@ -1,13 +1,7 @@ # Passthrough, do not break uplevel make rule install-activity: -SUBDIRS = - -pythondir = $(PYTHON_PLUGIN_DIR) - -dist_python_DATA= explore_world_music.py - - +SUBDIRS = resources xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@ diff --git a/src/explore_world_music-activity/resources/explore_world_music/Makefile.am b/src/explore_world_music-activity/resources/explore_world_music/Makefile.am new file mode 100644 index 000000000..1240d4dfe --- /dev/null +++ b/src/explore_world_music-activity/resources/explore_world_music/Makefile.am @@ -0,0 +1,27 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_world_music +img_DATA = \ + africa.ogg\ + africa.png\ + america.ogg\ + america.png\ + australia.ogg\ + australia.png\ + beethoven.ogg\ + content.desktop.in\ + dancingWorld.png\ + ireland.ogg\ + ireland.png\ + italy.ogg\ + italy.png\ + japan.ogg\ + japan.png\ + mexico.ogg\ + mexico.png\ + middleeast.ogg\ + middleeast.png\ + orchestra.png\ + star.png\ + suitcase.png\ + worldmap.png + +EXTRA_DIST = $(img_DATA) \ No newline at end of file From 3a2a500befeabe8069db85c29100b068120b1478 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 21 Aug 2012 23:48:20 +0200 Subject: [PATCH 16/22] Build explore world music activity. --- configure.ac | 3 +++ src/Makefile.am | 1 + 2 files changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 407c38b57..83db8bbff 100644 --- a/configure.ac +++ b/configure.ac @@ -659,6 +659,9 @@ src/erase_clic-activity/Makefile src/explore-activity/Makefile src/explore-activity/resources/Makefile src/explore-activity/resources/explore/Makefile +src/explore_world_music-activity/Makefile +src/explore_world_music-activity/resources/Makefile +src/explore_world_music-activity/resources/explore_world_music/Makefile src/fifteen-activity/Makefile src/fifteen-activity/resources/Makefile src/fifteen-activity/resources/fifteen/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 763e04ae9..d459aeb39 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,7 @@ SUBDIRS = \ erase_2clic-activity \ erase_clic-activity \ explore-activity \ + explore_world_music-activity \ fifteen-activity \ findit-activity \ followline-activity \ From 0eedccdec3c9d3c30dde084e362964dce8fbc8b2 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Tue, 21 Aug 2012 23:58:43 +0200 Subject: [PATCH 17/22] Added/updated explore farm animals activity. Temporary solution: install content.desktop.in (like for explore_world_music) --- src/explore_farm_animals-activity/Makefile.am | 8 +----- .../explore_farm_animals/Makefile.am | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am diff --git a/src/explore_farm_animals-activity/Makefile.am b/src/explore_farm_animals-activity/Makefile.am index 838cd17c2..f2f827268 100644 --- a/src/explore_farm_animals-activity/Makefile.am +++ b/src/explore_farm_animals-activity/Makefile.am @@ -1,13 +1,7 @@ # Passthrough, do not break uplevel make rule install-activity: -SUBDIRS = - -pythondir = $(PYTHON_PLUGIN_DIR) - -dist_python_DATA= explore_farm_animals.py - - +SUBDIRS = resources xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@ diff --git a/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am b/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am new file mode 100644 index 000000000..d504ac03f --- /dev/null +++ b/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am @@ -0,0 +1,27 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_farm_animals +img_DATA = \ + cat.JPG\ + cat.ogg\ + chicken.JPG\ + chickens.ogg\ + content.desktop.in\ + correctpic.png\ + cow.jpg\ + cow.ogg\ + dog.jpg\ + dog.ogg\ + duck.jpg\ + duck.ogg\ + farm-animals.jpg\ + horse.jpg\ + horse.ogg\ + owl.jpg\ + owl.ogg\ + pig.jpg\ + pig.ogg\ + questionpic.png\ + rooster.jpg\ + rooster.ogg\ + rooster.wav + +EXTRA_DIST = $(img_DATA) From 0867cfb86c477a3319a9feea43246b2585d18351 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Wed, 22 Aug 2012 00:00:02 +0200 Subject: [PATCH 18/22] Build explore farm animals activity. --- configure.ac | 3 +++ src/Makefile.am | 1 + 2 files changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 83db8bbff..399344281 100644 --- a/configure.ac +++ b/configure.ac @@ -659,6 +659,9 @@ src/erase_clic-activity/Makefile src/explore-activity/Makefile src/explore-activity/resources/Makefile src/explore-activity/resources/explore/Makefile +src/explore_farm_animals-activity/Makefile +src/explore_farm_animals-activity/resources/Makefile +src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile src/explore_world_music-activity/Makefile src/explore_world_music-activity/resources/Makefile src/explore_world_music-activity/resources/explore_world_music/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index d459aeb39..79eff457f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,7 @@ SUBDIRS = \ erase_2clic-activity \ erase_clic-activity \ explore-activity \ + explore_farm_animals-activity \ explore_world_music-activity \ fifteen-activity \ findit-activity \ From 0d3e1aaecda876fe97c817e6933cd0237391a190 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Wed, 22 Aug 2012 00:08:04 +0200 Subject: [PATCH 19/22] Added/updated explore world animals activity build files. Temporary solution: install content.desktop.in (like explore music activity). --- src/explore_world_animals-activity/Makefile.am | 8 +------- .../resources/Makefile.am | 1 + .../resources/explore_world_animals/Makefile.am | 13 +++++++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 src/explore_world_animals-activity/resources/Makefile.am create mode 100644 src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am diff --git a/src/explore_world_animals-activity/Makefile.am b/src/explore_world_animals-activity/Makefile.am index 44a0a1940..b017be592 100644 --- a/src/explore_world_animals-activity/Makefile.am +++ b/src/explore_world_animals-activity/Makefile.am @@ -1,13 +1,7 @@ # Passthrough, do not break uplevel make rule install-activity: -SUBDIRS = - -pythondir = $(PYTHON_PLUGIN_DIR) - -dist_python_DATA= explore_world_animals.py - - +SUBDIRS = resources xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@ diff --git a/src/explore_world_animals-activity/resources/Makefile.am b/src/explore_world_animals-activity/resources/Makefile.am new file mode 100644 index 000000000..1cb7a5626 --- /dev/null +++ b/src/explore_world_animals-activity/resources/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = explore_world_animals diff --git a/src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am b/src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am new file mode 100644 index 000000000..e740b7953 --- /dev/null +++ b/src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am @@ -0,0 +1,13 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_world_animals +img_DATA = \ + bison.png\ + content.desktop.in\ + gt.png\ + hedgy.jpg\ + hedgy.png\ + jaggy.png\ + narwhal.png\ + tux.png\ + world.png + +EXTRA_DIST = $(img_DATA) From 2dcd3b47144fc32f6923a63045b46f355c2895fe Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Wed, 22 Aug 2012 00:09:14 +0200 Subject: [PATCH 20/22] Build explore world animals activity. --- configure.ac | 3 +++ src/Makefile.am | 1 + 2 files changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 399344281..dfeb5fecb 100644 --- a/configure.ac +++ b/configure.ac @@ -662,6 +662,9 @@ src/explore-activity/resources/explore/Makefile src/explore_farm_animals-activity/Makefile src/explore_farm_animals-activity/resources/Makefile src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile +src/explore_world_animals-activity/Makefile +src/explore_world_animals-activity/resources/Makefile +src/explore_world_animals-activity/resources/explore_world_animals/Makefile src/explore_world_music-activity/Makefile src/explore_world_music-activity/resources/Makefile src/explore_world_music-activity/resources/explore_world_music/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 79eff457f..ad08bf1c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -47,6 +47,7 @@ SUBDIRS = \ erase_clic-activity \ explore-activity \ explore_farm_animals-activity \ + explore_world_animals-activity \ explore_world_music-activity \ fifteen-activity \ findit-activity \ From 4f1a817c199f1c5e75840277b387621f0c0b03d6 Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Wed, 22 Aug 2012 20:17:58 +0200 Subject: [PATCH 21/22] Remove deleted files from makefiles. --- .../resources/explore_farm_animals/Makefile.am | 1 - .../resources/explore_world_music/Makefile.am | 1 - 2 files changed, 2 deletions(-) diff --git a/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am b/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am index d504ac03f..a5d8a7af5 100644 --- a/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am +++ b/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am @@ -5,7 +5,6 @@ img_DATA = \ chicken.JPG\ chickens.ogg\ content.desktop.in\ - correctpic.png\ cow.jpg\ cow.ogg\ dog.jpg\ diff --git a/src/explore_world_music-activity/resources/explore_world_music/Makefile.am b/src/explore_world_music-activity/resources/explore_world_music/Makefile.am index 1240d4dfe..9563b209b 100644 --- a/src/explore_world_music-activity/resources/explore_world_music/Makefile.am +++ b/src/explore_world_music-activity/resources/explore_world_music/Makefile.am @@ -20,7 +20,6 @@ img_DATA = \ middleeast.ogg\ middleeast.png\ orchestra.png\ - star.png\ suitcase.png\ worldmap.png From 17ebf6d51c117a2b8cf161adfb25cc51e2c5683a Mon Sep 17 00:00:00 2001 From: Olivier Samyn Date: Sun, 26 Aug 2012 23:19:33 +0200 Subject: [PATCH 22/22] synchronize installed files with Bruno's changes. --- .../explore_farm_animals/Makefile.am | 7 ++-- .../explore_world_animals/Makefile.am | 11 +++-- .../resources/explore_world_music/Makefile.am | 22 +++++----- .../resources/piano_composition/Makefile.am | 42 +++++++++---------- .../playActivities/background/Makefile.am | 12 +++--- .../resources/play_rhythm/Makefile.am | 1 - 6 files changed, 45 insertions(+), 50 deletions(-) diff --git a/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am b/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am index a5d8a7af5..2c124922e 100644 --- a/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am +++ b/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am @@ -1,8 +1,8 @@ imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_farm_animals img_DATA = \ - cat.JPG\ + cat.jpg\ cat.ogg\ - chicken.JPG\ + chicken.jpg\ chickens.ogg\ content.desktop.in\ cow.jpg\ @@ -20,7 +20,6 @@ img_DATA = \ pig.ogg\ questionpic.png\ rooster.jpg\ - rooster.ogg\ - rooster.wav + rooster.ogg EXTRA_DIST = $(img_DATA) diff --git a/src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am b/src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am index e740b7953..15e6ab0d6 100644 --- a/src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am +++ b/src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am @@ -1,13 +1,12 @@ imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_world_animals img_DATA = \ - bison.png\ + bison.jpg\ content.desktop.in\ - gt.png\ + giraffe.jpg\ hedgy.jpg\ - hedgy.png\ - jaggy.png\ - narwhal.png\ + jaggy.jpg\ + narwhal.jpg\ tux.png\ - world.png + world.jpg EXTRA_DIST = $(img_DATA) diff --git a/src/explore_world_music-activity/resources/explore_world_music/Makefile.am b/src/explore_world_music-activity/resources/explore_world_music/Makefile.am index 9563b209b..4756eba2f 100644 --- a/src/explore_world_music-activity/resources/explore_world_music/Makefile.am +++ b/src/explore_world_music-activity/resources/explore_world_music/Makefile.am @@ -1,26 +1,26 @@ imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_world_music img_DATA = \ + africa.jpg\ africa.ogg\ - africa.png\ + america.jpg\ america.ogg\ - america.png\ + australia.jpg\ australia.ogg\ - australia.png\ beethoven.ogg\ content.desktop.in\ dancingWorld.png\ + ireland.jpg\ ireland.ogg\ - ireland.png\ + italy.jpg\ italy.ogg\ - italy.png\ + japan.jpg\ japan.ogg\ - japan.png\ + mexico.jpg\ mexico.ogg\ - mexico.png\ + middleeast.jpg\ middleeast.ogg\ - middleeast.png\ - orchestra.png\ + orchestra.jpg\ suitcase.png\ - worldmap.png + worldmap.jpg -EXTRA_DIST = $(img_DATA) \ No newline at end of file +EXTRA_DIST = $(img_DATA) diff --git a/src/piano_composition-activity/resources/piano_composition/Makefile.am b/src/piano_composition-activity/resources/piano_composition/Makefile.am index a4819827e..f681cbb59 100644 --- a/src/piano_composition-activity/resources/piano_composition/Makefile.am +++ b/src/piano_composition-activity/resources/piano_composition/Makefile.am @@ -2,29 +2,27 @@ SUBDIRS = bass_pitches buttons playActivities treble_pitches imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition img_DATA = \ - bach.png \ - banana.png \ - bassClef.png \ - blackflat.png \ - blacksharp.png \ - eighthNote.png \ - flag.png \ - gsoc2012.png \ - halfNote.png \ - happyNote.png \ - keyboard.png \ - load.png \ - melodies.desktop.in \ - mozart.png \ - note_highlight.png \ - quarterNote.png \ - sadNote.png \ - save.png \ - tool-load.png \ - tool-save.png \ - trebleClef.png \ + bach.jpg\ + banana.png\ + bassClef.png\ + blackflat.png\ + blacksharp.png\ + eighthNote.png\ + flag.png\ + gsoc2012.jpg\ + halfNote.png\ + happyNote.png\ + keyboard.png\ + load.png\ + melodies.desktop.in\ + mozart.jpg\ + note_highlight.png\ + quarterNote.png\ + sadNote.png\ + save.png\ + trebleClef.png\ wholeNote.png -EXTRA_DIST = $(img_DATA) +EXTRA_DIST = $(img_DATA) diff --git a/src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile.am b/src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile.am index 847c99684..63330ce8b 100644 --- a/src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile.am +++ b/src/piano_composition-activity/resources/piano_composition/playActivities/background/Makefile.am @@ -1,11 +1,11 @@ imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition/playActivities/background img_DATA = \ - 1.png \ - 2.png \ - 3.png \ - 4.png \ - 5.png \ - 6.png + 1.jpg \ + 2.jpg \ + 3.jpg \ + 4.jpg \ + 5.jpg \ + 6.jpg EXTRA_DIST = $(img_DATA) diff --git a/src/play_rhythm-activity/resources/play_rhythm/Makefile.am b/src/play_rhythm-activity/resources/play_rhythm/Makefile.am index 6ff466c1d..5c515f194 100644 --- a/src/play_rhythm-activity/resources/play_rhythm/Makefile.am +++ b/src/play_rhythm-activity/resources/play_rhythm/Makefile.am @@ -1,6 +1,5 @@ imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/play_rhythm img_DATA = \ - click-old1.wav \ click.wav \ drumhead.png \ metronome.png \