Commit 207cbb25 authored by Bruno Coudoin's avatar Bruno Coudoin

Directory reorganization. removed the subdirectory /activity in each activity

it's not worth have to generate 100 makefiles for 2 files in them.

svn path=/branches/gcomprixo/; revision=3014
parent b34f137d
......@@ -549,105 +549,74 @@ docs/fr/Makefile
gcompris-installer.nsi
macosx/Makefile
po/Makefile.in
src/tuxpaint-activity/activity/Makefile
src/tuxpaint-activity/Makefile
src/billard-activity/activity/Makefile
src/billard-activity/Makefile
src/billard-activity/resources/Makefile
src/billard-activity/resources/billard/Makefile
src/clickgame-activity/activity/Makefile
src/clickgame-activity/Makefile
src/clickgame-activity/resources/Makefile
src/clickgame-activity/resources/clickgame/Makefile
src/planegame-activity/activity/Makefile
src/planegame-activity/Makefile
src/planegame-activity/resources/Makefile
src/planegame-activity/resources/planegame/Makefile
src/superbrain-activity/activity/Makefile
src/superbrain-activity/Makefile
src/superbrain-activity/resources/superbrain/Makefile
src/superbrain-activity/resources/Makefile
src/money_cents-activity/activity/Makefile
src/money_cents-activity/Makefile
src/memory_add_minus_mult_div_tux-activity/activity/Makefile
src/memory_add_minus_mult_div_tux-activity/Makefile
src/redraw_symmetrical-activity/activity/Makefile
src/redraw_symmetrical-activity/Makefile
src/gletters-activity/activity/Makefile
src/gletters-activity/Makefile
src/gletters-activity/resources/Makefile
src/gletters-activity/resources/gletters/Makefile
src/hanoi_real-activity/activity/Makefile
src/hanoi_real-activity/Makefile
src/hanoi_real-activity/resources/hanoi_real/Makefile
src/hanoi_real-activity/resources/Makefile
src/algorithm-activity/activity/Makefile
src/algorithm-activity/Makefile
src/algorithm-activity/resources/Makefile
src/algorithm-activity/resources/algorithm/Makefile
src/algebra_guesscount-activity/activity/Makefile
src/algebra_guesscount-activity/Makefile
src/algebra_guesscount-activity/resources/Makefile
src/algebra_guesscount-activity/resources/algebra_guesscount/Makefile
src/read_colors-activity/activity/Makefile
src/read_colors-activity/Makefile
src/read_colors-activity/resources/read_colors/Makefile
src/read_colors-activity/resources/Makefile
src/memory_sound_tux-activity/activity/Makefile
src/memory_sound_tux-activity/Makefile
src/watercycle-activity/activity/Makefile
src/watercycle-activity/Makefile
src/watercycle-activity/resources/Makefile
src/watercycle-activity/resources/watercycle/Makefile
src/awele-activity/activity/Makefile
src/awele-activity/Makefile
src/awele-activity/resources/Makefile
src/awele-activity/resources/awele/Makefile
src/reversecount-activity/activity/Makefile
src/reversecount-activity/Makefile
src/reversecount-activity/resources/Makefile
src/reversecount-activity/resources/reversecount/Makefile
src/chess_partyend-activity/activity/Makefile
src/chess_partyend-activity/Makefile
src/connect4-2players-activity/activity/Makefile
src/connect4-2players-activity/Makefile
src/draw-activity/activity/Makefile
src/draw-activity/Makefile
src/libgnomecanvas/Makefile
src/imagename-activity/activity/Makefile
src/imagename-activity/Makefile
src/imagename-activity/resources/Makefile
src/imagename-activity/resources/imagename/Makefile
src/electric-activity/activity/Makefile
src/electric-activity/Makefile
src/electric-activity/resources/Makefile
src/electric-activity/resources/electric/Makefile
src/hanoi-activity/activity/Makefile
src/hanoi-activity/Makefile
src/connect4-activity/activity/Makefile
src/connect4-activity/Makefile
src/connect4-activity/resources/Makefile
src/connect4-activity/resources/connect4/Makefile
src/connect4-activity/connect4p/Makefile
src/memory_minus_tux-activity/activity/Makefile
src/memory_minus_tux-activity/Makefile
src/babymatch-activity/activity/Makefile
src/babymatch-activity/Makefile
src/babymatch-activity/resources/Makefile
src/babymatch-activity/resources/babymatch/Makefile
src/memory_mult_tux-activity/activity/Makefile
src/memory_mult_tux-activity/Makefile
src/memory_mult-activity/activity/Makefile
src/memory_mult-activity/Makefile
src/fifteen-activity/activity/Makefile
src/fifteen-activity/Makefile
src/fifteen-activity/resources/Makefile
src/fifteen-activity/resources/fifteen/Makefile
src/guessnumber-activity/activity/Makefile
src/guessnumber-activity/Makefile
src/guessnumber-activity/resources/Makefile
src/guessnumber-activity/resources/guessnumber/Makefile
src/geography-activity/activity/Makefile
src/geography-activity/Makefile
src/geography-activity/resources/Makefile
src/geography-activity/resources/geography/Makefile
......@@ -657,59 +626,42 @@ src/geography-activity/resources/geography/continents/Makefile
src/geography-activity/resources/geography/europe/Makefile
src/geography-activity/resources/geography/northamerica/Makefile
src/geography-activity/resources/geography/southamerica/Makefile
src/chat-activity/activity/Makefile
src/chat-activity/Makefile
src/readingv-activity/activity/Makefile
src/readingv-activity/Makefile
src/melody-activity/activity/Makefile
src/melody-activity/Makefile
src/melody-activity/resources/Makefile
src/melody-activity/resources/melody/Makefile
src/gcompris/Makefile
src/missing_letter-activity/activity/Makefile
src/missing_letter-activity/Makefile
src/missing_letter-activity/resources/missing_letter/Makefile
src/missing_letter-activity/resources/Makefile
src/erase-activity/activity/Makefile
src/erase-activity/Makefile
src/erase-activity/resources/Makefile
src/erase-activity/resources/erase/Makefile
src/enumerate-activity/activity/Makefile
src/enumerate-activity/Makefile
src/enumerate-activity/resources/Makefile
src/enumerate-activity/resources/enumerate/Makefile
src/pythontest-activity/activity/Makefile
src/pythontest-activity/Makefile
src/gnumch-factors-activity/activity/Makefile
src/gnumch-factors-activity/Makefile
src/maze2DRelative-activity/activity/Makefile
src/maze2DRelative-activity/Makefile
src/money-activity/activity/Makefile
src/money-activity/Makefile
src/money-activity/resources/Makefile
src/money-activity/resources/money/Makefile
src/writing_tutor_image_match-activity/activity/Makefile
src/writing_tutor_image_match-activity/Makefile
src/writing_tutor_image_match-activity/resources/Makefile
src/writing_tutor_image_match-activity/resources/writing_tutor/Makefile
src/writing_tutor_image_match-activity/DTW/Makefile
src/algebra_plus-activity/activity/Makefile
src/algebra_plus-activity/Makefile
src/crane-activity/activity/Makefile
src/crane-activity/Makefile
src/crane-activity/resources/Makefile
src/crane-activity/resources/crane/Makefile
src/bargame-activity/activity/Makefile
src/bargame-activity/Makefile
src/bargame-activity/resources/Makefile
src/bargame-activity/resources/bargame/Makefile
src/pythontemplate-activity/activity/Makefile
src/pythontemplate-activity/Makefile
src/submarine-activity/activity/Makefile
src/submarine-activity/Makefile
src/submarine-activity/resources/Makefile
src/submarine-activity/resources/submarine/Makefile
src/geography_country-activity/activity/Makefile
src/geography_country-activity/Makefile
src/geography_country-activity/resources/Makefile
src/geography_country-activity/resources/geography_country/Makefile
......@@ -719,153 +671,103 @@ src/geography_country-activity/resources/geography_country/germany_region/Makefi
src/geography_country-activity/resources/geography_country/norway_counties/Makefile
src/geography_country-activity/resources/geography_country/poland_voivodship/Makefile
src/geography_country-activity/resources/geography_country/turkey_district/Makefile
src/paratrooper-activity/activity/Makefile
src/paratrooper-activity/Makefile
src/paratrooper-activity/resources/Makefile
src/paratrooper-activity/resources/paratrooper/Makefile
src/readingh-activity/activity/Makefile
src/readingh-activity/Makefile
src/readingh-activity/resources/Makefile
src/readingh-activity/resources/wordsgame/Makefile
src/drawnumber-activity/activity/Makefile
src/drawnumber-activity/Makefile
src/drawnumber-activity/resources/Makefile
src/drawnumber-activity/resources/drawnumber/Makefile
src/mazeInvisible-activity/activity/Makefile
src/mazeInvisible-activity/Makefile
src/memory_mult_div_tux-activity/activity/Makefile
src/memory_mult_div_tux-activity/Makefile
src/smallnumbers2-activity/activity/Makefile
src/smallnumbers2-activity/Makefile
src/memory_add-activity/activity/Makefile
src/memory_add-activity/Makefile
src/scalesboard-activity/activity/Makefile
src/scalesboard-activity/Makefile
src/scalesboard-activity/resources/Makefile
src/scalesboard-activity/resources/scale/Makefile
src/memory_add_tux-activity/activity/Makefile
src/memory_add_tux-activity/Makefile
src/magic_hat_minus-activity/activity/Makefile
src/magic_hat_minus-activity/Makefile
src/magic_hat_minus-activity/resources/Makefile
src/magic_hat_minus-activity/resources/magic_hat/Makefile
src/algebra_by-activity/activity/Makefile
src/algebra_by-activity/Makefile
src/algebra_by-activity/resources/Makefile
src/algebra_by-activity/resources/algebra/Makefile
src/doubleentry-activity/activity/Makefile
src/doubleentry-activity/Makefile
src/doubleentry-activity/resources/doubleentry/Makefile
src/doubleentry-activity/resources/Makefile
src/chronos-activity/activity/Makefile
src/chronos-activity/Makefile
src/chronos-activity/resources/chronos/Makefile
src/chronos-activity/resources/Makefile
src/redraw-activity/activity/Makefile
src/redraw-activity/Makefile
src/maze-activity/activity/Makefile
src/maze-activity/Makefile
src/maze-activity/resources/Makefile
src/maze-activity/resources/maze/Makefile
src/memory_add_minus_mult_div-activity/activity/Makefile
src/memory_add_minus_mult_div-activity/Makefile
src/colors-activity/activity/Makefile
src/colors-activity/Makefile
src/colors-activity/resources/Makefile
src/colors-activity/resources/colors/Makefile
src/clockgame-activity/activity/Makefile
src/clockgame-activity/Makefile
src/clockgame-activity/resources/Makefile
src/clockgame-activity/resources/clockgame/Makefile
src/memory_div_tux-activity/activity/Makefile
src/memory_div_tux-activity/Makefile
src/memory_div-activity/activity/Makefile
src/memory_div-activity/Makefile
src/Makefile
src/smallnumbers-activity/activity/Makefile
src/smallnumbers-activity/Makefile
src/smallnumbers-activity/resources/Makefile
src/smallnumbers-activity/resources/smallnumbers/Makefile
src/searace-activity/activity/Makefile
src/searace-activity/Makefile
src/searace-activity/resources/Makefile
src/searace-activity/resources/searace/Makefile
src/administration-activity/activity/Makefile
src/administration-activity/admin/Makefile
src/administration-activity/Makefile
src/ballcatch-activity/activity/Makefile
src/ballcatch-activity/Makefile
src/ballcatch-activity/resources/Makefile
src/ballcatch-activity/resources/ballcatch/Makefile
src/canal_lock-activity/activity/Makefile
src/canal_lock-activity/Makefile
src/canal_lock-activity/resources/Makefile
src/canal_lock-activity/resources/canal_lock/Makefile
src/memory_add_minus-activity/activity/Makefile
src/memory_add_minus-activity/Makefile
src/gnumch-equality-activity/activity/Makefile
src/gnumch-equality-activity/Makefile
src/gnumch-equality-activity/resources/Makefile
src/gnumch-equality-activity/resources/gnumch/Makefile
src/erase_clic-activity/activity/Makefile
src/erase_clic-activity/Makefile
src/anim-activity/activity/Makefile
src/anim-activity/Makefile
src/target-activity/activity/Makefile
src/target-activity/Makefile
src/target-activity/resources/Makefile
src/target-activity/resources/target/Makefile
src/memory-activity/activity/Makefile
src/memory-activity/Makefile
src/memory-activity/resources/Makefile
src/memory-activity/resources/memory/Makefile
src/writing_tutor_template_match-activity/activity/Makefile
src/writing_tutor_template_match-activity/Makefile
src/wordsgame-activity/activity/Makefile
src/wordsgame-activity/Makefile
src/advanced_colors-activity/activity/Makefile
src/advanced_colors-activity/Makefile
src/advanced_colors-activity/resources/advanced_colors/Makefile
src/advanced_colors-activity/resources/Makefile
src/memory_mult_div-activity/activity/Makefile
src/memory_mult_div-activity/Makefile
src/algebra_minus-activity/activity/Makefile
src/algebra_minus-activity/Makefile
src/tangram-activity/activity/Makefile
src/tangram-activity/Makefile
src/tangram-activity/resources/Makefile
src/tangram-activity/resources/tangram/Makefile
src/gnumch-inequality-activity/activity/Makefile
src/gnumch-inequality-activity/Makefile
src/maze3D-activity/activity/Makefile
src/maze3D-activity/Makefile
src/writing_tutor_pattern_admin-activity/activity/Makefile
src/writing_tutor_pattern_admin-activity/Makefile
src/chess_computer-activity/activity/Makefile
src/chess_computer-activity/Makefile
src/chess_computer-activity/resources/Makefile
src/chess_computer-activity/resources/chess/Makefile
src/sudoku-activity/activity/Makefile
src/sudoku-activity/Makefile
src/sudoku-activity/resources/Makefile
src/sudoku-activity/resources/sudoku/Makefile
src/hexagon-activity/activity/Makefile
src/hexagon-activity/Makefile
src/magic_hat_plus-activity/activity/Makefile
src/magic_hat_plus-activity/Makefile
src/railroad-activity/activity/Makefile
src/railroad-activity/Makefile
src/railroad-activity/resources/Makefile
src/railroad-activity/resources/railroad/Makefile
src/memory_sound-activity/activity/Makefile
src/memory_sound-activity/Makefile
src/memory_add_minus_tux-activity/activity/Makefile
src/memory_add_minus_tux-activity/Makefile
src/writing_tutor_missing_match-activity/activity/Makefile
src/writing_tutor_missing_match-activity/Makefile
src/gnumch-multiples-activity/activity/Makefile
src/gnumch-multiples-activity/Makefile
src/babyshapes-activity/activity/Makefile
src/babyshapes-activity/Makefile
src/babyshapes-activity/resources/babyshapes/Makefile
src/babyshapes-activity/resources/Makefile
......@@ -881,49 +783,34 @@ src/boards/python/gcompris/sound/Makefile
src/boards/python/Makefile
src/boards/Makefile
src/libart_lgpl/Makefile
src/click_on_letter-activity/activity/Makefile
src/click_on_letter-activity/Makefile
src/click_on_letter-activity/resources/click_on_letter/Makefile
src/click_on_letter-activity/resources/Makefile
src/memory_minus-activity/activity/Makefile
src/memory_minus-activity/Makefile
src/wordprocessor-activity/activity/Makefile
src/wordprocessor-activity/Makefile
src/memory_tux-activity/activity/Makefile
src/memory_tux-activity/Makefile
src/paintings-activity/activity/Makefile
src/paintings-activity/Makefile
src/paintings-activity/resources/Makefile
src/paintings-activity/resources/paintings/Makefile
src/traffic-activity/activity/Makefile
src/traffic-activity/Makefile
src/traffic-activity/resources/Makefile
src/traffic-activity/resources/traffic/Makefile
src/leftright-activity/activity/Makefile
src/leftright-activity/Makefile
src/leftright-activity/resources/Makefile
src/leftright-activity/resources/leftright/Makefile
src/login-activity/activity/Makefile
src/login-activity/Makefile
src/login-activity/resources/Makefile
src/login-activity/resources/login/Makefile
src/imageid-activity/activity/Makefile
src/imageid-activity/Makefile
src/imageid-activity/resources/Makefile
src/imageid-activity/resources/imageid/Makefile
src/searace1player-activity/activity/Makefile
src/searace1player-activity/Makefile
src/chess_movelearn-activity/activity/Makefile
src/chess_movelearn-activity/Makefile
src/followline-activity/activity/Makefile
src/followline-activity/Makefile
src/followline-activity/resources/Makefile
src/followline-activity/resources/followline/Makefile
src/clickanddraw-activity/activity/Makefile
src/clickanddraw-activity/Makefile
src/gnumch-primes-activity/activity/Makefile
src/gnumch-primes-activity/Makefile
src/mosaic-activity/activity/Makefile
src/mosaic-activity/Makefile
src/mosaic-activity/resources/Makefile
src/mosaic-activity/resources/mosaic/Makefile
......
SUBDIRS = activity
SUBDIRS =
pythondir = $(PYTHON_PLUGIN_DIR)
dist_python_DATA= administration.py
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
xml_in_files = \
administration.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@
CLEANFILES = $(xml_DATA)
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
xml_in_files = \
administration.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@
CLEANFILES = $(xml_DATA)
......@@ -10,6 +10,6 @@ then
fi
$path/gcompris.bin -L $plugindir -P $path -A $path/resources \
--config-dir=. -M $path/activity \
--config-dir=. -M $path \
--locale_dir=$path/locale -a $*
SUBDIRS = activity resources
SUBDIRS = resources
if PLATFORM_WIN32
shared = -shared
......@@ -27,3 +27,29 @@ INCLUDES = -I$(top_srcdir)/src \
libadvanced_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS)
libadvanced_colors_la_LIBADD =
libadvanced_colors_la_SOURCES = advanced_colors.c
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
xml_in_files = \
advanced_colors.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@
CLEANFILES = $(xml_DATA)
icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
icon_DATA = advanced_colors.svg
EXTRA_DIST = $(icon_DATA)
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
xml_in_files = \
advanced_colors.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@
CLEANFILES = $(xml_DATA)
icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
icon_DATA = advanced_colors.svg
EXTRA_DIST = $(icon_DATA)
......@@ -10,6 +10,6 @@ then
fi
$path/gcompris.bin -L $plugindir -P $path -A $path/resources \
--config-dir=. -M $path/activity \
--config-dir=. -M $path \
--locale_dir=$path/locale -l /discovery/colors_group/$activity $*