From 21e99cf8d4d297deb57f92062b18b6772773c132 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 29 Aug 2015 13:10:03 +0200 Subject: [PATCH] Use explicit dependencies instead of CONFIG += ordered Makes inter-dependencies clearer and allows parallel build of independent libs on multi-core systems, e.g. with: $ make -j4 --- RetroShare.pro | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/RetroShare.pro b/RetroShare.pro index 9ec3de6fc..b6df6e491 100644 --- a/RetroShare.pro +++ b/RetroShare.pro @@ -1,16 +1,35 @@ TEMPLATE = subdirs -CONFIG += ordered - SUBDIRS += \ - openpgpsdk/src/openpgpsdk.pro \ - supportlibs/pegmarkdown/pegmarkdown.pro \ - libbitdht/src/libbitdht.pro \ - libretroshare/src/libretroshare.pro \ - libresapi/src/libresapi.pro \ - retroshare-gui/src/retroshare-gui.pro \ - retroshare-nogui/src/retroshare-nogui.pro \ - plugins/plugins.pro + openpgpsdk \ + libbitdht \ + libretroshare \ + libresapi \ + pegmarkdown \ + retroshare_gui \ + retroshare_nogui \ + plugins + +openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro + +libbitdht.file = libbitdht/src/libbitdht.pro + +libretroshare.file = libretroshare/src/libretroshare.pro +libretroshare.depends = openpgpsdk libbitdht + +libresapi.file = libresapi/src/libresapi.pro +libresapi.depends = libretroshare + +pegmarkdown.file = supportlibs/pegmarkdown/pegmarkdown.pro + +retroshare_gui.file = retroshare-gui/src/retroshare-gui.pro +retroshare_gui.depends = libretroshare libresapi pegmarkdown + +retroshare_nogui.file = retroshare-nogui/src/retroshare-nogui.pro +retroshare_nogui.depends = libretroshare libresapi + +plugins.file = plugins/plugins.pro +plugins.depends = retroshare_gui unix { isEmpty(PREFIX) { PREFIX = /usr }