diff --git a/configure.ac b/configure.ac index da13ea380..dfeb5fecb 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 @@ -656,6 +656,18 @@ 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/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 src/fifteen-activity/Makefile src/fifteen-activity/resources/Makefile src/fifteen-activity/resources/fifteen/Makefile @@ -792,6 +804,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 @@ -804,9 +817,29 @@ 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 +src/play_piano-activity/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 2669da1e5..ad08bf1c5 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 \ @@ -45,6 +45,10 @@ SUBDIRS = justtesting-activity explore_farm_animals-activity explore_farm_animal erase-activity \ erase_2clic-activity \ erase_clic-activity \ + explore-activity \ + explore_farm_animals-activity \ + explore_world_animals-activity \ + explore_world_music-activity \ fifteen-activity \ findit-activity \ followline-activity \ @@ -104,11 +108,15 @@ SUBDIRS = justtesting-activity explore_farm_animals-activity explore_farm_animal money_back_cents-activity \ money_cents-activity \ mosaic-activity \ + note_names-activity \ paintings-activity \ paratrooper-activity \ penalty-activity \ photohunter-activity \ + piano_composition-activity \ planegame-activity \ + play_piano-activity \ + play_rhythm-activity \ pythontemplate-activity \ pythontest-activity \ railroad-activity \ 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/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): 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) 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..2c124922e --- /dev/null +++ b/src/explore_farm_animals-activity/resources/explore_farm_animals/Makefile.am @@ -0,0 +1,25 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_farm_animals +img_DATA = \ + cat.jpg\ + cat.ogg\ + chicken.jpg\ + chickens.ogg\ + content.desktop.in\ + 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 + +EXTRA_DIST = $(img_DATA) 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..15e6ab0d6 --- /dev/null +++ b/src/explore_world_animals-activity/resources/explore_world_animals/Makefile.am @@ -0,0 +1,12 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_world_animals +img_DATA = \ + bison.jpg\ + content.desktop.in\ + giraffe.jpg\ + hedgy.jpg\ + jaggy.jpg\ + narwhal.jpg\ + tux.png\ + world.jpg + +EXTRA_DIST = $(img_DATA) 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..4756eba2f --- /dev/null +++ b/src/explore_world_music-activity/resources/explore_world_music/Makefile.am @@ -0,0 +1,26 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/explore_world_music +img_DATA = \ + africa.jpg\ + africa.ogg\ + america.jpg\ + america.ogg\ + australia.jpg\ + australia.ogg\ + beethoven.ogg\ + content.desktop.in\ + dancingWorld.png\ + ireland.jpg\ + ireland.ogg\ + italy.jpg\ + italy.ogg\ + japan.jpg\ + japan.ogg\ + mexico.jpg\ + mexico.ogg\ + middleeast.jpg\ + middleeast.ogg\ + orchestra.jpg\ + suitcase.png\ + worldmap.jpg + +EXTRA_DIST = $(img_DATA) 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 \ 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 - 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..f681cbb59 --- /dev/null +++ b/src/piano_composition-activity/resources/piano_composition/Makefile.am @@ -0,0 +1,28 @@ +SUBDIRS = bass_pitches buttons playActivities treble_pitches + +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/piano_composition +img_DATA = \ + 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) 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..63330ce8b --- /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.jpg \ + 2.jpg \ + 3.jpg \ + 4.jpg \ + 5.jpg \ + 6.jpg + + +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 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..5c515f194 --- /dev/null +++ b/src/play_rhythm-activity/resources/play_rhythm/Makefile.am @@ -0,0 +1,8 @@ +imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/play_rhythm +img_DATA = \ + click.wav \ + drumhead.png \ + metronome.png \ + record.png + +EXTRA_DIST = $(img_DATA)