From 4175aff8b54da00c2749f6a2a1f7488dcf2dba9d Mon Sep 17 00:00:00 2001
From: Joachim Schoeberl <joachim.schoeberl@tuwien.ac.at>
Date: Wed, 13 Aug 2014 16:15:19 +0000
Subject: [PATCH] libadds

---
 libsrc/interface/Makefile.am |  3 +++
 ng/Makefile.am               |  9 ++++++---
 ng/ngappinit.cpp             |  1 +
 nglib/Makefile.am            | 16 ++++++++--------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/libsrc/interface/Makefile.am b/libsrc/interface/Makefile.am
index 01379795..0f751225 100644
--- a/libsrc/interface/Makefile.am
+++ b/libsrc/interface/Makefile.am
@@ -10,3 +10,6 @@ libinterface_la_SOURCES = nginterface.cpp nginterface_v2.cpp \
 	wuchemnitz.cpp writegmsh2.cpp writeOpenFOAM15x.cpp 
 
 
+libinterface_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la
+
+# libinterface_la_LDFLAGS = -rdynamic
diff --git a/ng/Makefile.am b/ng/Makefile.am
index 64328883..1bec48c6 100644
--- a/ng/Makefile.am
+++ b/ng/Makefile.am
@@ -1,6 +1,6 @@
 include_HEADERS = 
 
-AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL  -D$(TOGL_WINDOWINGSYSTEM)  $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL  -D$(TOGL_WINDOWINGSYSTEM)  $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) -I/usr/include/python3.4
 
 if NGGUI
 bin_PROGRAMS = netgen
@@ -21,7 +21,8 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \
 	$(top_builddir)/libsrc/csg/libcsg.la \
 	$(top_builddir)/libsrc/interface/libinterface.la \
 	$(top_builddir)/libsrc/meshing/libmesh.la \
-	-L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
+	-L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS) 
+
 
 #
 #	$(top_builddir)/libsrc/occ/liboccvis.la 
@@ -43,8 +44,10 @@ ngtesting.tcl parameters.tcl variables.tcl csgeom.tcl stlgeom.tcl \
 occgeom.tcl acisgeom.tcl netgen.ocf
 
 
-netgen_LDFLAGS = -export-dynamic 
+netgen_LDFLAGS = -export-dynamic -lboost_python-py34 -lpython3.4m
 # netgen_LDFLAGS = -rdynamic 
 # -static
 
+# netgen_LDFLAGS += -rdynamic
+
 
diff --git a/ng/ngappinit.cpp b/ng/ngappinit.cpp
index e9d43e8f..f64d57a2 100644
--- a/ng/ngappinit.cpp
+++ b/ng/ngappinit.cpp
@@ -7,6 +7,7 @@
 #include "incvis.hpp"
 #include <meshing.hpp>
 
+#include <boost/python.hpp>
 
 
 namespace netgen
diff --git a/nglib/Makefile.am b/nglib/Makefile.am
index 668278cd..833b56f8 100644
--- a/nglib/Makefile.am
+++ b/nglib/Makefile.am
@@ -7,14 +7,14 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include  $(MPI_INCLUDES) $(OCCFLAGS)
 lib_LTLIBRARIES = libnglib.la
 libnglib_la_SOURCES = nglib.cpp 
 
-# libnglib_la_LIBADD = \
-#	$(top_builddir)/libsrc/interface/libinterface.la \
-#	$(top_builddir)/libsrc/geom2d/libgeom2d.la \
-#	$(top_builddir)/libsrc/csg/libcsg.la \
-#	$(top_builddir)/libsrc/stlgeom/libstl.la \
-#	$(top_builddir)/libsrc/occ/libocc.la \
-#	$(top_builddir)/libsrc/meshing/libmesh.la \
-#	$(OCCLIBS) $(MPI_LIBS)
+libnglib_la_LIBADD = \
+	$(top_builddir)/libsrc/interface/libinterface.la \
+	$(top_builddir)/libsrc/geom2d/libgeom2d.la \
+	$(top_builddir)/libsrc/csg/libcsg.la \
+	$(top_builddir)/libsrc/stlgeom/libstl.la \
+	$(top_builddir)/libsrc/occ/libocc.la \
+	$(top_builddir)/libsrc/meshing/libmesh.la \
+	$(OCCLIBS) $(MPI_LIBS)
 
 libnglib_la_LDFLAGS = -avoid-version
 #  -rdynamic