Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-06-26 15:25:00 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-06-26 15:25:26 (GMT)
commitd18bacb2425a741fe841e1de1e730f45584e03d0 (patch)
treee1fe8a3053184b3a29bd5dd240b5c1c2d85df48e /Makefile
parenta1aaad3647c13c3798bdb131642deaf0ed5f4f59 (diff)
Pull activities from activities.sugarlabs.org
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
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)