From 61e4b9735ce0c96dafec992d2b982514fadd64a0 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <maemo@javispedro.com>
Date: Fri, 9 Dec 2011 02:55:49 +0100
Subject: Some changes to Makefiles to enable parallelism during build

---
 qtc_packaging/debian_harmattan/rules | 10 +++++++++-
 sowatch.pro                          | 32 +++++++++++++++++---------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index b9a1fd2..07d6f82 100755
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -9,6 +9,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Enable parallelism in $(MAKE) subcall if requested
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS:= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	PARALLEL:= -j$(NUMJOBS)
+else
+	PARALLEL:=
+endif
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -23,7 +31,7 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
-	# $(MAKE) # Uncomment this line for use without Qt Creator
+	# $(MAKE) $(PARALLEL) # Uncomment this line for use without Qt Creator
 	#docbook-to-man debian/sowatch.sgml > sowatch.1
 
 	touch $@
diff --git a/sowatch.pro b/sowatch.pro
index a97d90a..ca44495 100644
--- a/sowatch.pro
+++ b/sowatch.pro
@@ -1,22 +1,24 @@
 TEMPLATE = subdirs
-SUBDIRS = libsowatch \
-	metawatch \
-	sowatchd \
-	sowatchui \
-	notificationswatchlet \
-	sysinfowatchlet
+SUBDIRS = libsowatch
+
+SUBDIRS += metawatch sowatchd sowatchui
+SUBDIRS += notificationswatchlet sysinfowatchlet
+
+metawatch.depends = libsowatch
+sowatchd.depends = libsowatch
+sowatchui.depends = libsowatch sowatchd
+notificationswatchlet.depends = libsowatch
+sysinfowatchlet.depends = libsowatch
 
 !isEmpty(MEEGO_VERSION_MAJOR) {
-	SUBDIRS += meegohandsetnotification ckitcallnotification harmaccuweather qmafwwatchlet qmapwatchlet
-}
+	SUBDIRS += meegohandsetnotification ckitcallnotification harmaccuweather
+	SUBDIRS += qmafwwatchlet qmapwatchlet
 
-unix:!symbian {
-	maemo5 {
-		target.path = /opt/sowatch/notifications
-	} else {
-		target.path = /usr/lib/sowatch/notifications
-	}
-	INSTALLS += target
+	meegohandsetnotification.depends = libsowatch
+	ckitcallnotification.depends = libsowatch
+	harmaccuweather.depends = libsowatch
+	qmafwwatchlet.depends = libsowatch
+	qmapwatchlet.depends = libsowatch
 }
 
 OTHER_FILES += \
-- 
cgit v1.2.3