make iris buildable with make -j

git-svn-id: http://delta.affinix.com/svn/trunk/iris@676 ac7a513c-5e3a-0410-af42-968c3ac6e7dc
tfar · Jul 3, 2009 · 2a6c485 · 2a6c485
1 parent 760636d
commit 2a6c485
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/iris.pro b/iris.pro
@@ -12,6 +12,10 @@ appledns:!appledns_bundle:CONFIG *= build_src
 !irisnetcore_bundle:CONFIG *= build_src
 !iris_bundle:CONFIG *= build_src
 
-build_src:SUBDIRS += src
+sub_src.subdir = src
+sub_tools.subdir = tools
+sub_tools.depends = sub_src
 
-!no_tests:SUBDIRS += tools
+build_src:SUBDIRS += sub_src
+
+!no_tests:SUBDIRS += sub_tools
diff --git a/src/irisnet/irisnet.pro b/src/irisnet/irisnet.pro
@@ -2,6 +2,12 @@ TEMPLATE = subdirs
 
 include(../libbase.pri)
 
-!irisnetcore_bundle:SUBDIRS += corelib
-appledns:!appledns_bundle:SUBDIRS += appledns
-!iris_bundle:SUBDIRS += noncore
+sub_corelib.subdir = corelib
+sub_appledns.subdir = appledns
+sub_appledns.depends = sub_corelib
+sub_noncore.subdir = noncore
+!irisnetcore_bundle:sub_noncore.depends = sub_corelib
+
+!irisnetcore_bundle:SUBDIRS += sub_corelib
+appledns:!appledns_bundle:SUBDIRS += sub_appledns
+!iris_bundle:SUBDIRS += sub_noncore
diff --git a/src/src.pro b/src/src.pro
@@ -2,5 +2,9 @@ TEMPLATE = subdirs
 
 include(libbase.pri)
 
-SUBDIRS += irisnet
-!iris_bundle:SUBDIRS += xmpp
+sub_irisnet.subdir = irisnet
+sub_xmpp.subdir = xmpp
+sub_xmpp.depends = sub_irisnet
+
+SUBDIRS += sub_irisnet
+!iris_bundle:SUBDIRS += sub_xmpp