[gcompris] Support standalone install mode for activities

From: Bruno Coudoin <bcoudoin src gnome org>
To: commits-list gnome org
Cc:
Subject: [gcompris] Support standalone install mode for activities
Date: Tue, 27 Sep 2011 22:09:24 +0000 (UTC)
commit cc8746a2ee575441a70b058cd4ff5642e4cbb5ca
Author: Aleksey Lim <alsroot sugarlabs org>
Date:   Sat Sep 24 19:23:43 2011 +0000

    Support standalone install mode for activities
    
    Call 'make DESTDIR=<DESTDIR> install-activity' from activity directory
    to install only this particular activity to the DESTDIR. All activities
    need to add following lines to their Makefile.am:
    
      include /Makefile.activity
      ACTIVITY_SUBDIRS = <directory-names-of-dependency-activities>

 Makefile.activity                                  |   28 ++++++++++++++++++++
 Makefile.am                                        |    2 +
 src/Makefile.am                                    |    3 ++
 src/administration-activity/Makefile.am            |    7 +++++
 src/advanced_colors-activity/Makefile.am           |    3 ++
 src/algebra_by-activity/Makefile.am                |    2 +
 src/algebra_guesscount-activity/Makefile.am        |    3 ++
 src/algebra_minus-activity/Makefile.am             |    3 ++
 src/algebra_plus-activity/Makefile.am              |    3 ++
 src/algorithm-activity/Makefile.am                 |    2 +
 src/anim-activity/Makefile.am                      |    2 +
 src/awele-activity/Makefile.am                     |    2 +
 src/babymatch-activity/Makefile.am                 |    2 +
 src/babyshapes-activity/Makefile.am                |    3 ++
 src/ballcatch-activity/Makefile.am                 |    2 +
 src/bargame-activity/Makefile.am                   |    2 +
 src/billard-activity/Makefile.am                   |    2 +
 src/boards/Makefile.am                             |    3 ++
 src/braille_alphabets-activity/Makefile.am         |    2 +
 src/braille_fun-activity/Makefile.am               |    3 ++
 src/braille_lotto-activity/Makefile.am             |    3 ++
 src/canal_lock-activity/Makefile.am                |    2 +
 src/chat-activity/Makefile.am                      |    2 +
 src/chess_computer-activity/Makefile.am            |    2 +
 src/chess_movelearn-activity/Makefile.am           |    3 ++
 src/chess_partyend-activity/Makefile.am            |    3 ++
 src/chronos-activity/Makefile.am                   |    3 ++
 src/click_on_letter-activity/Makefile.am           |    2 +
 src/click_on_letter_up-activity/Makefile.am        |    3 ++
 src/clickanddraw-activity/Makefile.am              |    3 ++
 src/clickgame-activity/Makefile.am                 |    2 +
 src/clockgame-activity/Makefile.am                 |    2 +
 src/colors-activity/Makefile.am                    |    3 ++
 src/connect4-2players-activity/Makefile.am         |    3 ++
 src/connect4-activity/Makefile.am                  |    2 +
 src/crane-activity/Makefile.am                     |    2 +
 src/details-activity/Makefile.am                   |    3 ++
 src/doubleentry-activity/Makefile.am               |    3 ++
 src/draw-activity/Makefile.am                      |    3 ++
 src/drawnumber-activity/Makefile.am                |    2 +
 src/electric-activity/Makefile.am                  |    2 +
 src/enumerate-activity/Makefile.am                 |    2 +
 src/erase-activity/Makefile.am                     |    2 +
 src/erase_2clic-activity/Makefile.am               |    3 ++
 src/erase_clic-activity/Makefile.am                |    3 ++
 src/fifteen-activity/Makefile.am                   |    2 +
 src/findit-activity/Makefile.am                    |    4 +++
 src/followline-activity/Makefile.am                |    2 +
 src/gcompris/Makefile.am                           |    3 ++
 src/geo_country-activity/Makefile.am               |    3 ++
 src/geography-activity/Makefile.am                 |    3 ++
 src/gletters-activity/Makefile.am                  |    2 +
 src/gnumch-equality-activity/Makefile.am           |    2 +
 src/gnumch-factors-activity/Makefile.am            |    3 ++
 src/gnumch-inequality-activity/Makefile.am         |    3 ++
 src/gnumch-multiples-activity/Makefile.am          |    3 ++
 src/gnumch-primes-activity/Makefile.am             |    3 ++
 src/goocanvas/Makefile.am                          |    3 ++
 src/guessnumber-activity/Makefile.am               |    2 +
 src/hangman-activity/Makefile.am                   |    3 ++
 src/hanoi-activity/Makefile.am                     |    2 +
 src/hanoi_real-activity/Makefile.am                |    2 +
 src/hexagon-activity/Makefile.am                   |    2 +
 src/hydroelectric-activity/Makefile.am             |    2 +
 src/imageid-activity/Makefile.am                   |    2 +
 src/imagename-activity/Makefile.am                 |    3 ++
 src/instruments-activity/Makefile.am               |    3 ++
 src/leftright-activity/Makefile.am                 |    2 +
 src/lightsoff-activity/Makefile.am                 |    2 +
 src/login-activity/Makefile.am                     |    3 ++
 src/louis_braille-activity/Makefile.am             |    3 ++
 src/magic_hat_minus-activity/Makefile.am           |    2 +
 src/magic_hat_plus-activity/Makefile.am            |    3 ++
 src/maze-activity/Makefile.am                      |    2 +
 src/maze2DRelative-activity/Makefile.am            |    3 ++
 src/maze3D-activity/Makefile.am                    |    3 ++
 src/mazeInvisible-activity/Makefile.am             |    3 ++
 src/melody-activity/Makefile.am                    |    2 +
 src/memory-activity/Makefile.am                    |    2 +
 src/memory_add-activity/Makefile.am                |    3 ++
 src/memory_add_minus-activity/Makefile.am          |    3 ++
 src/memory_add_minus_mult_div-activity/Makefile.am |    3 ++
 .../Makefile.am                                    |    3 ++
 src/memory_add_minus_tux-activity/Makefile.am      |    3 ++
 src/memory_add_tux-activity/Makefile.am            |    3 ++
 src/memory_div-activity/Makefile.am                |    3 ++
 src/memory_div_tux-activity/Makefile.am            |    3 ++
 src/memory_enumerate-activity/Makefile.am          |    3 ++
 src/memory_minus-activity/Makefile.am              |    3 ++
 src/memory_minus_tux-activity/Makefile.am          |    3 ++
 src/memory_mult-activity/Makefile.am               |    3 ++
 src/memory_mult_div-activity/Makefile.am           |    3 ++
 src/memory_mult_div_tux-activity/Makefile.am       |    3 ++
 src/memory_mult_tux-activity/Makefile.am           |    3 ++
 src/memory_sound-activity/Makefile.am              |    3 ++
 src/memory_sound_tux-activity/Makefile.am          |    3 ++
 src/memory_tux-activity/Makefile.am                |    3 ++
 src/memory_wordnumber-activity/Makefile.am         |    3 ++
 src/missing_letter-activity/Makefile.am            |    2 +
 src/money-activity/Makefile.am                     |    2 +
 src/money_back-activity/Makefile.am                |    3 ++
 src/money_back_cents-activity/Makefile.am          |    3 ++
 src/money_cents-activity/Makefile.am               |    3 ++
 src/mosaic-activity/Makefile.am                    |    2 +
 src/paintings-activity/Makefile.am                 |    3 ++
 src/paratrooper-activity/Makefile.am               |    2 +
 src/penalty-activity/Makefile.am                   |    2 +
 src/photohunter-activity/Makefile.am               |    2 +
 src/planegame-activity/Makefile.am                 |    2 +
 src/pythontemplate-activity/Makefile.am            |    3 ++
 src/pythontest-activity/Makefile.am                |    3 ++
 src/railroad-activity/Makefile.am                  |    2 +
 src/readingh-activity/Makefile.am                  |    2 +
 src/readingv-activity/Makefile.am                  |    3 ++
 src/redraw-activity/Makefile.am                    |    3 ++
 src/redraw_symmetrical-activity/Makefile.am        |    3 ++
 src/reversecount-activity/Makefile.am              |    2 +
 src/scalesboard-activity/Makefile.am               |    2 +
 src/scalesboard_weight-activity/Makefile.am        |    3 ++
 src/searace-activity/Makefile.am                   |    2 +
 src/searace1player-activity/Makefile.am            |    3 ++
 src/smallnumbers-activity/Makefile.am              |    2 +
 src/smallnumbers2-activity/Makefile.am             |    3 ++
 src/submarine-activity/Makefile.am                 |    2 +
 src/sudoku-activity/Makefile.am                    |    2 +
 src/superbrain-activity/Makefile.am                |    2 +
 src/tangram-activity/Makefile.am                   |    2 +
 src/target-activity/Makefile.am                    |    2 +
 src/traffic-activity/Makefile.am                   |    2 +
 src/tuxpaint-activity/Makefile.am                  |    3 ++
 src/watercycle-activity/Makefile.am                |    2 +
 src/wordprocessor-activity/Makefile.am             |    2 +
 src/wordsgame-activity/Makefile.am                 |    3 ++
 133 files changed, 370 insertions(+), 0 deletions(-)
---
diff --git a/Makefile.activity b/Makefile.activity
new file mode 100644
index 0000000..1c688cc
--- /dev/null
+++ b/Makefile.activity
@@ -0,0 +1,28 @@
+ACTIVITY_DESTDIR = $(DESTDIR)/$(notdir $(abs_builddir))
+
+install-activity: all-am do-install-activity do-install-resources do-install-launcher
+
+do-install-activity: install
+	for i in $(ACTIVITY_SUBDIRS); do $(MAKE) -C ../$$i do-install-activity || break 0; done
+
+do-install-resources:
+	@[ "$(DESTDIR)" ] || (echo 'Pass DESTDIR with $@'; false)
+	$(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) -C $(top_builddir)/src/goocanvas install
+	$(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) -C $(top_builddir)/src/gcompris install
+	$(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) -C $(top_builddir)/po install
+	$(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) do-install-activity
+	$(INSTALL) -d $(ACTIVITY_DESTDIR)/$(pkgdatadir)/boards
+	cp -r $(top_srcdir)/boards/skins $(ACTIVITY_DESTDIR)/$(pkgdatadir)/boards/
+	cp -r $(top_srcdir)/boards/sounds $(ACTIVITY_DESTDIR)/$(pkgdatadir)/boards/
+	if [ "$$(cat $(builddir)/*.xml | grep 'type *=.*python:')" ]; then \
+		$(MAKE) DESTDIR=$(ACTIVITY_DESTDIR) -C $(top_builddir)/src/boards install; \
+	fi
+
+do-install-launcher:
+	[ $(notdir $(abs_builddir)) == administration-activity ] || ( \
+	mv $(ACTIVITY_DESTDIR)/$(bindir)/gcompris{,.bin}; \
+	launcher=$(ACTIVITY_DESTDIR)/$(bindir)/gcompris; \
+	name="$$(cat $(builddir)/*.xml | grep -o 'name *= *"[^"]\+' | awk -F\" '{print $$2}')"; \
+	section="$$(cat $(builddir)/*.xml | grep -o 'section *= *"[^"]\+' | awk -F\" '{print $$2}')"; \
+	echo -e "#!/bin/sh\nexec \$$(dirname \$$0)/gcompris.bin -l $$section/$$name \$$@" > $$launcher; \
+	chmod 0755 $$launcher )
diff --git a/Makefile.am b/Makefile.am
index 6e08ea1..fb9b86a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,5 +93,7 @@ update-voices:
 
 all-local:
 
+install-activity:
+	$(MAKE) -C src $@
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/src/Makefile.am b/src/Makefile.am
index 03d580f..f3b97b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
+install-activity:
+	for i in $(SUBDIRS); do $(MAKE) -C $$i $@ || break 0; done
+
 SUBDIRS = \
 	administration-activity \
 	advanced_colors-activity \
diff --git a/src/administration-activity/Makefile.am b/src/administration-activity/Makefile.am
index f35c5e2..d976f69 100644
--- a/src/administration-activity/Makefile.am
+++ b/src/administration-activity/Makefile.am
@@ -1,3 +1,10 @@
+include $(top_srcdir)/Makefile.activity
+
+install-activity:
+	$(MAKE) -C $(top_srcdir)/boards
+	cp $(top_srcdir)/boards/*.svg $(ACTIVITY_DESTDIR)/$(pkgdatadir)/boards/
+	cp $(top_srcdir)/boards/*.xml $(ACTIVITY_DESTDIR)/$(pkgdatadir)/boards/
+
 SUBDIRS = admin resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/advanced_colors-activity/Makefile.am b/src/advanced_colors-activity/Makefile.am
index 99c019f..886ad2c 100644
--- a/src/advanced_colors-activity/Makefile.am
+++ b/src/advanced_colors-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = findit-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/algebra_by-activity/Makefile.am b/src/algebra_by-activity/Makefile.am
index ee77691..cc0056a 100644
--- a/src/algebra_by-activity/Makefile.am
+++ b/src/algebra_by-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/algebra_guesscount-activity/Makefile.am b/src/algebra_guesscount-activity/Makefile.am
index bef2dde..b70e5d1 100644
--- a/src/algebra_guesscount-activity/Makefile.am
+++ b/src/algebra_guesscount-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = algebra_by-activity
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/algebra_minus-activity/Makefile.am b/src/algebra_minus-activity/Makefile.am
index 7746683..2099b10 100644
--- a/src/algebra_minus-activity/Makefile.am
+++ b/src/algebra_minus-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = algebra_by-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/algebra_plus-activity/Makefile.am b/src/algebra_plus-activity/Makefile.am
index fd36804..3b029cd 100644
--- a/src/algebra_plus-activity/Makefile.am
+++ b/src/algebra_plus-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = algebra_by-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/algorithm-activity/Makefile.am b/src/algorithm-activity/Makefile.am
index efa9ae8..f3ec5da 100644
--- a/src/algorithm-activity/Makefile.am
+++ b/src/algorithm-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/anim-activity/Makefile.am b/src/anim-activity/Makefile.am
index 25922a2..4163287 100644
--- a/src/anim-activity/Makefile.am
+++ b/src/anim-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/awele-activity/Makefile.am b/src/awele-activity/Makefile.am
index c79d02a..3f1dda4 100644
--- a/src/awele-activity/Makefile.am
+++ b/src/awele-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/babymatch-activity/Makefile.am b/src/babymatch-activity/Makefile.am
index 42133dc..d38c88c 100644
--- a/src/babymatch-activity/Makefile.am
+++ b/src/babymatch-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/babyshapes-activity/Makefile.am b/src/babyshapes-activity/Makefile.am
index b2f2c9f..72560f3 100644
--- a/src/babyshapes-activity/Makefile.am
+++ b/src/babyshapes-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = babymatch-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/ballcatch-activity/Makefile.am b/src/ballcatch-activity/Makefile.am
index 5840428..59fa474 100644
--- a/src/ballcatch-activity/Makefile.am
+++ b/src/ballcatch-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/bargame-activity/Makefile.am b/src/bargame-activity/Makefile.am
index 8c9e1f7..c859f6c 100644
--- a/src/bargame-activity/Makefile.am
+++ b/src/bargame-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/billard-activity/Makefile.am b/src/billard-activity/Makefile.am
index 5503f0f..19bc3e4 100644
--- a/src/billard-activity/Makefile.am
+++ b/src/billard-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/boards/Makefile.am b/src/boards/Makefile.am
index 6602532..f03fbef 100644
--- a/src/boards/Makefile.am
+++ b/src/boards/Makefile.am
@@ -1,3 +1,6 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
 if PYTHON_PLUGIN
 python_plugin = libpython.la
 python_subdir = python
diff --git a/src/braille_alphabets-activity/Makefile.am b/src/braille_alphabets-activity/Makefile.am
index ad4e44d..53d154d 100644
--- a/src/braille_alphabets-activity/Makefile.am
+++ b/src/braille_alphabets-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/braille_fun-activity/Makefile.am b/src/braille_fun-activity/Makefile.am
index 5b801b2..e2346fc 100644
--- a/src/braille_fun-activity/Makefile.am
+++ b/src/braille_fun-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = braille_alphabets-activity
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/braille_lotto-activity/Makefile.am b/src/braille_lotto-activity/Makefile.am
index 25bc2da..493eadc 100644
--- a/src/braille_lotto-activity/Makefile.am
+++ b/src/braille_lotto-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = braille_alphabets-activity
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/canal_lock-activity/Makefile.am b/src/canal_lock-activity/Makefile.am
index d7600b2..3210032 100644
--- a/src/canal_lock-activity/Makefile.am
+++ b/src/canal_lock-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/chat-activity/Makefile.am b/src/chat-activity/Makefile.am
index 936a36c..9479b32 100644
--- a/src/chat-activity/Makefile.am
+++ b/src/chat-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/chess_computer-activity/Makefile.am b/src/chess_computer-activity/Makefile.am
index 0748db2..05b5a81 100644
--- a/src/chess_computer-activity/Makefile.am
+++ b/src/chess_computer-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 if BUILD_GNUCHESS
 SUBDIRS = resources gnuchess
 else
diff --git a/src/chess_movelearn-activity/Makefile.am b/src/chess_movelearn-activity/Makefile.am
index 9de464d..fa90716 100644
--- a/src/chess_movelearn-activity/Makefile.am
+++ b/src/chess_movelearn-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = chess_computer-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/chess_partyend-activity/Makefile.am b/src/chess_partyend-activity/Makefile.am
index 90c5e55..66d9cd7 100644
--- a/src/chess_partyend-activity/Makefile.am
+++ b/src/chess_partyend-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = chess_computer-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/chronos-activity/Makefile.am b/src/chronos-activity/Makefile.am
index 95a77ad..ace1bea 100644
--- a/src/chronos-activity/Makefile.am
+++ b/src/chronos-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = babymatch-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/click_on_letter-activity/Makefile.am b/src/click_on_letter-activity/Makefile.am
index 32e9552..a7b7e1b 100644
--- a/src/click_on_letter-activity/Makefile.am
+++ b/src/click_on_letter-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/click_on_letter_up-activity/Makefile.am b/src/click_on_letter_up-activity/Makefile.am
index f7852df..01643d0 100644
--- a/src/click_on_letter_up-activity/Makefile.am
+++ b/src/click_on_letter_up-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = click_on_letter-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/clickanddraw-activity/Makefile.am b/src/clickanddraw-activity/Makefile.am
index 715e760..1eecfcc 100644
--- a/src/clickanddraw-activity/Makefile.am
+++ b/src/clickanddraw-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = drawnumber-activity
 SUBDIRS =
 
 
diff --git a/src/clickgame-activity/Makefile.am b/src/clickgame-activity/Makefile.am
index 8445499..c5edd44 100644
--- a/src/clickgame-activity/Makefile.am
+++ b/src/clickgame-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/clockgame-activity/Makefile.am b/src/clockgame-activity/Makefile.am
index 2ec40a6..23a5556 100644
--- a/src/clockgame-activity/Makefile.am
+++ b/src/clockgame-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/colors-activity/Makefile.am b/src/colors-activity/Makefile.am
index 05ae0c2..7db7fa5 100644
--- a/src/colors-activity/Makefile.am
+++ b/src/colors-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = findit-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/connect4-2players-activity/Makefile.am b/src/connect4-2players-activity/Makefile.am
index 983612f..714163f 100644
--- a/src/connect4-2players-activity/Makefile.am
+++ b/src/connect4-2players-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = connect4-activity
 SUBDIRS =
 
 
diff --git a/src/connect4-activity/Makefile.am b/src/connect4-activity/Makefile.am
index 808f1ba..529effc 100644
--- a/src/connect4-activity/Makefile.am
+++ b/src/connect4-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources connect4p
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/crane-activity/Makefile.am b/src/crane-activity/Makefile.am
index 9cf185d..d56ad6c 100644
--- a/src/crane-activity/Makefile.am
+++ b/src/crane-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/details-activity/Makefile.am b/src/details-activity/Makefile.am
index a3274c3..e4c09bb 100644
--- a/src/details-activity/Makefile.am
+++ b/src/details-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = babymatch-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/doubleentry-activity/Makefile.am b/src/doubleentry-activity/Makefile.am
index e64467a..801ca3e 100644
--- a/src/doubleentry-activity/Makefile.am
+++ b/src/doubleentry-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = babymatch-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/draw-activity/Makefile.am b/src/draw-activity/Makefile.am
index 0086f85..c6af15e 100644
--- a/src/draw-activity/Makefile.am
+++ b/src/draw-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = anim-activity
 SUBDIRS =
 
 
diff --git a/src/drawnumber-activity/Makefile.am b/src/drawnumber-activity/Makefile.am
index 9a0c468..ed112e1 100644
--- a/src/drawnumber-activity/Makefile.am
+++ b/src/drawnumber-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/electric-activity/Makefile.am b/src/electric-activity/Makefile.am
index 7d24e0a..9ee705e 100644
--- a/src/electric-activity/Makefile.am
+++ b/src/electric-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/enumerate-activity/Makefile.am b/src/enumerate-activity/Makefile.am
index b282379..ac125cb 100644
--- a/src/enumerate-activity/Makefile.am
+++ b/src/enumerate-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/erase-activity/Makefile.am b/src/erase-activity/Makefile.am
index 40558ef..4b69479 100644
--- a/src/erase-activity/Makefile.am
+++ b/src/erase-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/erase_2clic-activity/Makefile.am b/src/erase_2clic-activity/Makefile.am
index e8848cf..7951606 100644
--- a/src/erase_2clic-activity/Makefile.am
+++ b/src/erase_2clic-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = erase-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/erase_clic-activity/Makefile.am b/src/erase_clic-activity/Makefile.am
index 38d37f4..3093713 100644
--- a/src/erase_clic-activity/Makefile.am
+++ b/src/erase_clic-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = erase-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/fifteen-activity/Makefile.am b/src/fifteen-activity/Makefile.am
index 714af31..b63fa5d 100644
--- a/src/fifteen-activity/Makefile.am
+++ b/src/fifteen-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/findit-activity/Makefile.am b/src/findit-activity/Makefile.am
index cd6c036..85c75cc 100644
--- a/src/findit-activity/Makefile.am
+++ b/src/findit-activity/Makefile.am
@@ -1,3 +1,7 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+do-install-activity: install
+
 SUBDIRS =
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/followline-activity/Makefile.am b/src/followline-activity/Makefile.am
index 324c9ca..2cbcf01 100644
--- a/src/followline-activity/Makefile.am
+++ b/src/followline-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/gcompris/Makefile.am b/src/gcompris/Makefile.am
index fec03ce..476eb59 100644
--- a/src/gcompris/Makefile.am
+++ b/src/gcompris/Makefile.am
@@ -1,3 +1,6 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
 ## Process this file with automake to produce Makefile.in
 if PYTHON_PLUGIN
 python_ldadd = $(PYTHON_LIBS)
diff --git a/src/geo_country-activity/Makefile.am b/src/geo_country-activity/Makefile.am
index d5bc955..c5bcede 100644
--- a/src/geo_country-activity/Makefile.am
+++ b/src/geo_country-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = babymatch-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/geography-activity/Makefile.am b/src/geography-activity/Makefile.am
index e9f1f59..2b3d930 100644
--- a/src/geography-activity/Makefile.am
+++ b/src/geography-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = babymatch-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/gletters-activity/Makefile.am b/src/gletters-activity/Makefile.am
index 652f3ec..bd29516 100644
--- a/src/gletters-activity/Makefile.am
+++ b/src/gletters-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/gnumch-equality-activity/Makefile.am b/src/gnumch-equality-activity/Makefile.am
index e028e1a..8771ae7 100644
--- a/src/gnumch-equality-activity/Makefile.am
+++ b/src/gnumch-equality-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/gnumch-factors-activity/Makefile.am b/src/gnumch-factors-activity/Makefile.am
index d70feb1..e44e50b 100644
--- a/src/gnumch-factors-activity/Makefile.am
+++ b/src/gnumch-factors-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = gnumch-equality-activity
 SUBDIRS =
 
 
diff --git a/src/gnumch-inequality-activity/Makefile.am b/src/gnumch-inequality-activity/Makefile.am
index 29cdb78..344101d 100644
--- a/src/gnumch-inequality-activity/Makefile.am
+++ b/src/gnumch-inequality-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = gnumch-equality-activity
 SUBDIRS =
 
 
diff --git a/src/gnumch-multiples-activity/Makefile.am b/src/gnumch-multiples-activity/Makefile.am
index eb9dc53..e8e0467 100644
--- a/src/gnumch-multiples-activity/Makefile.am
+++ b/src/gnumch-multiples-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = gnumch-equality-activity
 SUBDIRS =
 
 
diff --git a/src/gnumch-primes-activity/Makefile.am b/src/gnumch-primes-activity/Makefile.am
index 4318d2d..526b566 100644
--- a/src/gnumch-primes-activity/Makefile.am
+++ b/src/gnumch-primes-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = gnumch-equality-activity
 SUBDIRS =
 
 
diff --git a/src/goocanvas/Makefile.am b/src/goocanvas/Makefile.am
index b1a7c02..679c386 100644
--- a/src/goocanvas/Makefile.am
+++ b/src/goocanvas/Makefile.am
@@ -1,3 +1,6 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = src
diff --git a/src/guessnumber-activity/Makefile.am b/src/guessnumber-activity/Makefile.am
index 5d05f71..c58e3b9 100644
--- a/src/guessnumber-activity/Makefile.am
+++ b/src/guessnumber-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/hangman-activity/Makefile.am b/src/hangman-activity/Makefile.am
index 67aef41..c7be42d 100644
--- a/src/hangman-activity/Makefile.am
+++ b/src/hangman-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = readingh-activity
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/hanoi-activity/Makefile.am b/src/hanoi-activity/Makefile.am
index ead73ab..e9bcdaf 100644
--- a/src/hanoi-activity/Makefile.am
+++ b/src/hanoi-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS =
 
 if PLATFORM_WIN32
diff --git a/src/hanoi_real-activity/Makefile.am b/src/hanoi_real-activity/Makefile.am
index 188a06e..ad937dd 100644
--- a/src/hanoi_real-activity/Makefile.am
+++ b/src/hanoi_real-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/hexagon-activity/Makefile.am b/src/hexagon-activity/Makefile.am
index 61ebb66..3850daf 100644
--- a/src/hexagon-activity/Makefile.am
+++ b/src/hexagon-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/hydroelectric-activity/Makefile.am b/src/hydroelectric-activity/Makefile.am
index 9c5848e..fb1b284 100644
--- a/src/hydroelectric-activity/Makefile.am
+++ b/src/hydroelectric-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/imageid-activity/Makefile.am b/src/imageid-activity/Makefile.am
index e98dae5..29e2d9a 100644
--- a/src/imageid-activity/Makefile.am
+++ b/src/imageid-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/imagename-activity/Makefile.am b/src/imagename-activity/Makefile.am
index 22212de..16533ef 100644
--- a/src/imagename-activity/Makefile.am
+++ b/src/imagename-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = babymatch-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/instruments-activity/Makefile.am b/src/instruments-activity/Makefile.am
index a1a0975..4951d40 100644
--- a/src/instruments-activity/Makefile.am
+++ b/src/instruments-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = findit-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/leftright-activity/Makefile.am b/src/leftright-activity/Makefile.am
index 3d0b8ab..c6e6ce3 100644
--- a/src/leftright-activity/Makefile.am
+++ b/src/leftright-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/lightsoff-activity/Makefile.am b/src/lightsoff-activity/Makefile.am
index 8dc9204..778cb78 100644
--- a/src/lightsoff-activity/Makefile.am
+++ b/src/lightsoff-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/login-activity/Makefile.am b/src/login-activity/Makefile.am
index b8ea44d..2ca09f6 100644
--- a/src/login-activity/Makefile.am
+++ b/src/login-activity/Makefile.am
@@ -1,3 +1,6 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/louis_braille-activity/Makefile.am b/src/louis_braille-activity/Makefile.am
index e711818..e1b920c 100644
--- a/src/louis_braille-activity/Makefile.am
+++ b/src/louis_braille-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = braille_alphabets-activity
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/magic_hat_minus-activity/Makefile.am b/src/magic_hat_minus-activity/Makefile.am
index 3c75b2f..9459f0c 100644
--- a/src/magic_hat_minus-activity/Makefile.am
+++ b/src/magic_hat_minus-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/magic_hat_plus-activity/Makefile.am b/src/magic_hat_plus-activity/Makefile.am
index ff59fee..035a40f 100644
--- a/src/magic_hat_plus-activity/Makefile.am
+++ b/src/magic_hat_plus-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = magic_hat_minus-activity
 SUBDIRS =
 
 
diff --git a/src/maze-activity/Makefile.am b/src/maze-activity/Makefile.am
index 5dfb9be..b812b7d 100644
--- a/src/maze-activity/Makefile.am
+++ b/src/maze-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/maze2DRelative-activity/Makefile.am b/src/maze2DRelative-activity/Makefile.am
index 4a332d9..96aec44 100644
--- a/src/maze2DRelative-activity/Makefile.am
+++ b/src/maze2DRelative-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = maze-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/maze3D-activity/Makefile.am b/src/maze3D-activity/Makefile.am
index 2e451c4..0892f45 100644
--- a/src/maze3D-activity/Makefile.am
+++ b/src/maze3D-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = maze-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/mazeInvisible-activity/Makefile.am b/src/mazeInvisible-activity/Makefile.am
index 6931b22..f17436f 100644
--- a/src/mazeInvisible-activity/Makefile.am
+++ b/src/mazeInvisible-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = maze-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/melody-activity/Makefile.am b/src/melody-activity/Makefile.am
index 2749623..b196c83 100644
--- a/src/melody-activity/Makefile.am
+++ b/src/melody-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/memory-activity/Makefile.am b/src/memory-activity/Makefile.am
index 14b7d74..568f8be 100644
--- a/src/memory-activity/Makefile.am
+++ b/src/memory-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/memory_add-activity/Makefile.am b/src/memory_add-activity/Makefile.am
index 87411b7..6dc8b1c 100644
--- a/src/memory_add-activity/Makefile.am
+++ b/src/memory_add-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_add_minus-activity/Makefile.am b/src/memory_add_minus-activity/Makefile.am
index e636e46..cce2f75 100644
--- a/src/memory_add_minus-activity/Makefile.am
+++ b/src/memory_add_minus-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_add_minus_mult_div-activity/Makefile.am b/src/memory_add_minus_mult_div-activity/Makefile.am
index 8c0e2dd..c92f3dc 100644
--- a/src/memory_add_minus_mult_div-activity/Makefile.am
+++ b/src/memory_add_minus_mult_div-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_add_minus_mult_div_tux-activity/Makefile.am b/src/memory_add_minus_mult_div_tux-activity/Makefile.am
index faea70e..d486880 100644
--- a/src/memory_add_minus_mult_div_tux-activity/Makefile.am
+++ b/src/memory_add_minus_mult_div_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_add_minus_tux-activity/Makefile.am b/src/memory_add_minus_tux-activity/Makefile.am
index 2d6f4c4..2bf439a 100644
--- a/src/memory_add_minus_tux-activity/Makefile.am
+++ b/src/memory_add_minus_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_add_tux-activity/Makefile.am b/src/memory_add_tux-activity/Makefile.am
index e6a416d..f8f20c1 100644
--- a/src/memory_add_tux-activity/Makefile.am
+++ b/src/memory_add_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_div-activity/Makefile.am b/src/memory_div-activity/Makefile.am
index 97ec0eb..0e3326d 100644
--- a/src/memory_div-activity/Makefile.am
+++ b/src/memory_div-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_div_tux-activity/Makefile.am b/src/memory_div_tux-activity/Makefile.am
index 96a4a72..d1dc820 100644
--- a/src/memory_div_tux-activity/Makefile.am
+++ b/src/memory_div_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_enumerate-activity/Makefile.am b/src/memory_enumerate-activity/Makefile.am
index e8c15e4..7461ead 100644
--- a/src/memory_enumerate-activity/Makefile.am
+++ b/src/memory_enumerate-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_minus-activity/Makefile.am b/src/memory_minus-activity/Makefile.am
index ccc75e5..a212e60 100644
--- a/src/memory_minus-activity/Makefile.am
+++ b/src/memory_minus-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_minus_tux-activity/Makefile.am b/src/memory_minus_tux-activity/Makefile.am
index 1257c2a..3b56d16 100644
--- a/src/memory_minus_tux-activity/Makefile.am
+++ b/src/memory_minus_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_mult-activity/Makefile.am b/src/memory_mult-activity/Makefile.am
index 20659a6..ad8834b 100644
--- a/src/memory_mult-activity/Makefile.am
+++ b/src/memory_mult-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_mult_div-activity/Makefile.am b/src/memory_mult_div-activity/Makefile.am
index 248dce7..d8d52c8 100644
--- a/src/memory_mult_div-activity/Makefile.am
+++ b/src/memory_mult_div-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_mult_div_tux-activity/Makefile.am b/src/memory_mult_div_tux-activity/Makefile.am
index a1546c6..413aeec 100644
--- a/src/memory_mult_div_tux-activity/Makefile.am
+++ b/src/memory_mult_div_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_mult_tux-activity/Makefile.am b/src/memory_mult_tux-activity/Makefile.am
index 8af3737..56fdf05 100644
--- a/src/memory_mult_tux-activity/Makefile.am
+++ b/src/memory_mult_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_sound-activity/Makefile.am b/src/memory_sound-activity/Makefile.am
index 8abf00a..847ee0e 100644
--- a/src/memory_sound-activity/Makefile.am
+++ b/src/memory_sound-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_sound_tux-activity/Makefile.am b/src/memory_sound_tux-activity/Makefile.am
index 955a04e..7313a39 100644
--- a/src/memory_sound_tux-activity/Makefile.am
+++ b/src/memory_sound_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_tux-activity/Makefile.am b/src/memory_tux-activity/Makefile.am
index 63bedfa..38fc2d3 100644
--- a/src/memory_tux-activity/Makefile.am
+++ b/src/memory_tux-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/memory_wordnumber-activity/Makefile.am b/src/memory_wordnumber-activity/Makefile.am
index 1af2611..3e8ca9a 100644
--- a/src/memory_wordnumber-activity/Makefile.am
+++ b/src/memory_wordnumber-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = memory-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/missing_letter-activity/Makefile.am b/src/missing_letter-activity/Makefile.am
index 5c1cdec..8829317 100644
--- a/src/missing_letter-activity/Makefile.am
+++ b/src/missing_letter-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/money-activity/Makefile.am b/src/money-activity/Makefile.am
index ef7d6ac..d604439 100644
--- a/src/money-activity/Makefile.am
+++ b/src/money-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/money_back-activity/Makefile.am b/src/money_back-activity/Makefile.am
index e8eb945..beefe11 100644
--- a/src/money_back-activity/Makefile.am
+++ b/src/money_back-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = money-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/money_back_cents-activity/Makefile.am b/src/money_back_cents-activity/Makefile.am
index 961ce88..3ae56ed 100644
--- a/src/money_back_cents-activity/Makefile.am
+++ b/src/money_back_cents-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = money-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/money_cents-activity/Makefile.am b/src/money_cents-activity/Makefile.am
index 930f061..61f4c25 100644
--- a/src/money_cents-activity/Makefile.am
+++ b/src/money_cents-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = money-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/mosaic-activity/Makefile.am b/src/mosaic-activity/Makefile.am
index 068bc6d..79860b5 100644
--- a/src/mosaic-activity/Makefile.am
+++ b/src/mosaic-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/paintings-activity/Makefile.am b/src/paintings-activity/Makefile.am
index 1e9fe87..a19cdef 100644
--- a/src/paintings-activity/Makefile.am
+++ b/src/paintings-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = babymatch-activity
 SUBDIRS = resources
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/paratrooper-activity/Makefile.am b/src/paratrooper-activity/Makefile.am
index c898e62..e135e88 100644
--- a/src/paratrooper-activity/Makefile.am
+++ b/src/paratrooper-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/penalty-activity/Makefile.am b/src/penalty-activity/Makefile.am
index 05098e3..514c6e8 100644
--- a/src/penalty-activity/Makefile.am
+++ b/src/penalty-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/photohunter-activity/Makefile.am b/src/photohunter-activity/Makefile.am
index aaf55d4..b7ca8d3 100644
--- a/src/photohunter-activity/Makefile.am
+++ b/src/photohunter-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/planegame-activity/Makefile.am b/src/planegame-activity/Makefile.am
index 376d575..06d72d5 100644
--- a/src/planegame-activity/Makefile.am
+++ b/src/planegame-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/pythontemplate-activity/Makefile.am b/src/pythontemplate-activity/Makefile.am
index 9bb5c93..f585340 100644
--- a/src/pythontemplate-activity/Makefile.am
+++ b/src/pythontemplate-activity/Makefile.am
@@ -1,3 +1,6 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
 SUBDIRS =
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/pythontest-activity/Makefile.am b/src/pythontest-activity/Makefile.am
index ca01a16..3b93e26 100644
--- a/src/pythontest-activity/Makefile.am
+++ b/src/pythontest-activity/Makefile.am
@@ -1,3 +1,6 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
 SUBDIRS =
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/railroad-activity/Makefile.am b/src/railroad-activity/Makefile.am
index ed3cbb4..656f20e 100644
--- a/src/railroad-activity/Makefile.am
+++ b/src/railroad-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/readingh-activity/Makefile.am b/src/readingh-activity/Makefile.am
index 274b9f2..e10c36b 100644
--- a/src/readingh-activity/Makefile.am
+++ b/src/readingh-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/readingv-activity/Makefile.am b/src/readingv-activity/Makefile.am
index b1298f2..2985207 100644
--- a/src/readingv-activity/Makefile.am
+++ b/src/readingv-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = readingh-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/redraw-activity/Makefile.am b/src/redraw-activity/Makefile.am
index b92bd88..b17c13c 100644
--- a/src/redraw-activity/Makefile.am
+++ b/src/redraw-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = anim-activity
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/redraw_symmetrical-activity/Makefile.am b/src/redraw_symmetrical-activity/Makefile.am
index b8fae83..65e339f 100644
--- a/src/redraw_symmetrical-activity/Makefile.am
+++ b/src/redraw_symmetrical-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = redraw-activity
 SUBDIRS = resources
 
 
diff --git a/src/reversecount-activity/Makefile.am b/src/reversecount-activity/Makefile.am
index 4afcd5b..f2077a4 100644
--- a/src/reversecount-activity/Makefile.am
+++ b/src/reversecount-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/scalesboard-activity/Makefile.am b/src/scalesboard-activity/Makefile.am
index 9b26f93..553bbf1 100644
--- a/src/scalesboard-activity/Makefile.am
+++ b/src/scalesboard-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/scalesboard_weight-activity/Makefile.am b/src/scalesboard_weight-activity/Makefile.am
index 312c4ba..2acfad9 100644
--- a/src/scalesboard_weight-activity/Makefile.am
+++ b/src/scalesboard_weight-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = scalesboard-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/searace-activity/Makefile.am b/src/searace-activity/Makefile.am
index cf3258d..86f781c 100644
--- a/src/searace-activity/Makefile.am
+++ b/src/searace-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/searace1player-activity/Makefile.am b/src/searace1player-activity/Makefile.am
index f6d74cb..051031e 100644
--- a/src/searace1player-activity/Makefile.am
+++ b/src/searace1player-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = searace-activity
 SUBDIRS =
 
 
diff --git a/src/smallnumbers-activity/Makefile.am b/src/smallnumbers-activity/Makefile.am
index 68f6152..cc0b808 100644
--- a/src/smallnumbers-activity/Makefile.am
+++ b/src/smallnumbers-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/smallnumbers2-activity/Makefile.am b/src/smallnumbers2-activity/Makefile.am
index 3349a54..a5d4e27 100644
--- a/src/smallnumbers2-activity/Makefile.am
+++ b/src/smallnumbers2-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = smallnumbers-activity
 SUBDIRS =
 
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
diff --git a/src/submarine-activity/Makefile.am b/src/submarine-activity/Makefile.am
index 8582761..bdacce8 100644
--- a/src/submarine-activity/Makefile.am
+++ b/src/submarine-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/sudoku-activity/Makefile.am b/src/sudoku-activity/Makefile.am
index 1754f10..a730c3a 100644
--- a/src/sudoku-activity/Makefile.am
+++ b/src/sudoku-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/superbrain-activity/Makefile.am b/src/superbrain-activity/Makefile.am
index 4b0c167..551cf59 100644
--- a/src/superbrain-activity/Makefile.am
+++ b/src/superbrain-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/tangram-activity/Makefile.am b/src/tangram-activity/Makefile.am
index 684717c..7b3adee 100644
--- a/src/tangram-activity/Makefile.am
+++ b/src/tangram-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/target-activity/Makefile.am b/src/target-activity/Makefile.am
index 6652b5b..ddacb11 100644
--- a/src/target-activity/Makefile.am
+++ b/src/target-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/traffic-activity/Makefile.am b/src/traffic-activity/Makefile.am
index fba95e7..7301ad3 100644
--- a/src/traffic-activity/Makefile.am
+++ b/src/traffic-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/tuxpaint-activity/Makefile.am b/src/tuxpaint-activity/Makefile.am
index bd78dd9..789fc83 100644
--- a/src/tuxpaint-activity/Makefile.am
+++ b/src/tuxpaint-activity/Makefile.am
@@ -1,3 +1,6 @@
+# Passthrough, do not break uplevel make rule
+install-activity:
+
 SUBDIRS =
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/watercycle-activity/Makefile.am b/src/watercycle-activity/Makefile.am
index 7a72d48..da4da20 100644
--- a/src/watercycle-activity/Makefile.am
+++ b/src/watercycle-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
diff --git a/src/wordprocessor-activity/Makefile.am b/src/wordprocessor-activity/Makefile.am
index 3fcafd8..032ca3a 100644
--- a/src/wordprocessor-activity/Makefile.am
+++ b/src/wordprocessor-activity/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.activity
+
 SUBDIRS = resources
 
 if PLATFORM_WIN32
diff --git a/src/wordsgame-activity/Makefile.am b/src/wordsgame-activity/Makefile.am
index 9cb9b11..ec61d34 100644
--- a/src/wordsgame-activity/Makefile.am
+++ b/src/wordsgame-activity/Makefile.am
@@ -1,3 +1,6 @@
+include $(top_srcdir)/Makefile.activity
+
+ACTIVITY_SUBDIRS = readingh-activity
 SUBDIRS =
 
 if PLATFORM_WIN32
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]