From acacdc39974d0d0f26d91c4bf0848d465c19c4de Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 10 Jun 2018 21:45:58 +0200
Subject: [PATCH] Included ext definitions in Python module (currently: lay)

---
 src/ext/ext/extNetTracer.cc        |  3 ---
 src/ext/ext/extNetTracer.h         | 13 +++++++------
 src/ext/ext/extNetTracerPlugin.cc  |  1 +
 src/ext/unit_tests/extNetTracer.cc |  1 +
 src/pymod/lay/layMain.cc           |  6 ++++++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/ext/ext/extNetTracer.cc b/src/ext/ext/extNetTracer.cc
index 3b76c0dba..8e107b321 100644
--- a/src/ext/ext/extNetTracer.cc
+++ b/src/ext/ext/extNetTracer.cc
@@ -26,9 +26,6 @@
 #include "dbRecursiveShapeIterator.h"
 #include "dbPolygonTools.h"
 #include "dbShapeProcessor.h"
-#include "layViewObject.h"
-#include "layPlugin.h"
-#include "layLayoutView.h"
 #include "tlLog.h"
 
 //  -O3 appears not to work properly for gcc 4.4.7 (RHEL 6)
diff --git a/src/ext/ext/extNetTracer.h b/src/ext/ext/extNetTracer.h
index b4b83e698..3dab732ab 100644
--- a/src/ext/ext/extNetTracer.h
+++ b/src/ext/ext/extNetTracer.h
@@ -27,19 +27,20 @@
 
 #include "extCommon.h"
 
+#include "dbShapes.h"
+#include "dbShape.h"
+#include "dbEdgeProcessor.h"
+
+#include "tlProgress.h"
+#include "tlFixedVector.h"
+
 #include <vector>
 #include <map>
 #include <list>
 
-#include "dbEdgeProcessor.h"
-#include "layCellView.h"
-#include "tlProgress.h"
-#include "tlFixedVector.h"
-
 namespace db
 {
   class RecursiveShapeIterator;
-  class EdgeProcessor;
 }
 
 namespace ext
diff --git a/src/ext/ext/extNetTracerPlugin.cc b/src/ext/ext/extNetTracerPlugin.cc
index cdea7088f..326deed63 100644
--- a/src/ext/ext/extNetTracerPlugin.cc
+++ b/src/ext/ext/extNetTracerPlugin.cc
@@ -26,6 +26,7 @@
 #include "extNetTracerConfig.h"
 
 #include "layConverters.h"
+#include "layCellView.h"
 
 #include "gsiDecl.h"
 
diff --git a/src/ext/unit_tests/extNetTracer.cc b/src/ext/unit_tests/extNetTracer.cc
index fd0031f88..41dd7345e 100644
--- a/src/ext/unit_tests/extNetTracer.cc
+++ b/src/ext/unit_tests/extNetTracer.cc
@@ -30,6 +30,7 @@
 #include "dbLayoutDiff.h"
 #include "dbTestSupport.h"
 #include "dbWriter.h"
+#include "dbReader.h"
 
 static ext::NetTracerConnectionInfo connection (const std::string &a, const std::string &v, const std::string &b)
 {
diff --git a/src/pymod/lay/layMain.cc b/src/pymod/lay/layMain.cc
index aa9865404..e43fd734f 100644
--- a/src/pymod/lay/layMain.cc
+++ b/src/pymod/lay/layMain.cc
@@ -25,4 +25,10 @@
 //  to force linking of the lay module
 #include "../../lay/lay/layForceLink.h"
 
+//  to force linking of the ext module
+#include "../../ext/ext/extForceLink.h"
+
+//  NOTE: img, ant, edt and rdb don't need to be force-linked
+//  as they are hard-linked by lay
+
 DEFINE_PYMOD(lay, "lay", "KLayout core module 'lay'")