From e14234e0824640c7c2b64631ef5502423b3d00ea Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 27 Aug 2017 11:51:52 +0200
Subject: [PATCH] More build dependency fixes.

---
 src/klayout.pro | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/klayout.pro b/src/klayout.pro
index b8c5c28ab..dd5822ae0 100644
--- a/src/klayout.pro
+++ b/src/klayout.pro
@@ -8,8 +8,10 @@ SUBDIRS = \
   unit_tests \
   tl/tl \
   tl/unit_tests \
-  gsi \
-  db \
+  gsi/gsi \
+  gsi/unit_tests \
+  db/db \
+  db/unit_tests \
   rdb \
   lym \
   laybasic \
@@ -26,30 +28,30 @@ SUBDIRS = \
 
 equals(HAVE_RUBY, "1") {
   SUBDIRS += rba
-  rba.depends += gsi ut
+  rba.depends += gsi/gsi ut
 } else {
   SUBDIRS += rbastub
-  rbastub.depends += gsi
+  rbastub.depends += gsi/gsi
 }
 
 equals(HAVE_PYTHON, "1") {
   SUBDIRS += pya
-  pya.depends += gsi ut
+  pya.depends += gsi/gsi ut
 } else {
   SUBDIRS += pyastub
-  pyastub.depends += gsi
+  pyastub.depends += gsi/gsi
 }
 
-gsi.depends += tl/tl
-db.depends += gsi
-rdb.depends += db
-laybasic.depends += db rdb
+gsi-gsi.depends += tl/tl
+db-db.depends += gsi/gsi
+rdb.depends += db/db
+laybasic.depends += db/db rdb
 ant.depends += laybasic
 img.depends += laybasic
 edt.depends += laybasic
-drc.depends += db rdb lym
+drc.depends += rdb lym
 
-lym.depends += gsi
+lym.depends += gsi/gsi ut
 equals(HAVE_RUBY, "1") {
   lym.depends += rba
 } else {
@@ -62,21 +64,23 @@ equals(HAVE_PYTHON, "1") {
 }
 
 lay.depends += laybasic ant img edt lym
-lib.depends += db
-
-buddies.depends += db gsi ut
+ext.depends += lay
+lib.depends += db/db ut
+buddies.depends += db/db ut
 
 equals(HAVE_QTBINDINGS, "1") {
   SUBDIRS += gsiqt
-  gsiqt.depends += gsi
+  gsiqt.depends += gsi/gsi
   laybasic.depends += gsiqt
   lay.depends += gsiqt
 }
 
-ext.depends += lay
-ut.depends += db gsi
+ut.depends += db/db
+
 # YES. It's tl-unit_tests (for tl/unit_tests)
 tl-unit_tests.depends += ut
+gsi-unit_tests.depends += ut
+db-unit_tests.depends += ut
 
 plugins.depends += lay ext lib ut