From d18bacb2425a741fe841e1de1e730f45584e03d0 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Tue, 26 Jun 2012 15:25:00 +0000
Subject: Pull activities from activities.sugarlabs.org

---
(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7ceebd3..dee3b9f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ else
 TYPESCRIPT = script -ae -c
 endif
 
-all: build
+all: build install-activities
 
 submodules:
 	git submodule init
@@ -31,14 +31,13 @@ install-jhbuild: submodules check-system
 	./autogen.sh --prefix=$(CURDIR)/install ; \
 	make ; make install
 
-build-activities: submodules
-	$(LOG) "$(JHBUILD) run $(SCRIPTS)/build-activity terminal" $(LOGFILE)
-	$(LOG) "$(JHBUILD) run $(SCRIPTS)/build-activity browse" $(LOGFILE)
-
 build-glucose: install-jhbuild check-system
 	$(TYPESCRIPT) "$(JHBUILD) build" $(LOGFILE)
 
-build: build-glucose build-activities scripts/list-outputs
+build: build-glucose scripts/list-outputs
+
+install-activities:
+	$(SCRIPTS)/install-activities
 
 build-%:
 	$(TYPESCRIPT) "$(JHBUILD) buildone $*" $(LOGFILE)
--
cgit v0.9.1