From 0aee7bc25d932eddaf4d0b0c922f5f216e2e425d Mon Sep 17 00:00:00 2001
From: Joachim Schoeberl <joachim.schoeberl@tuwien.ac.at>
Date: Mon, 11 Jun 2012 20:19:06 +0000
Subject: [PATCH] undo lib dependencies

---
 AUTHORS                    |  2 +-
 libsrc/csg/Makefile.am     |  6 ++----
 libsrc/stlgeom/Makefile.am | 14 ++++++++------
 ng/Makefile.am             |  5 ++++-
 ng/stlgeom.tcl             |  4 ++--
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index d0c98081..d91a2489 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-Joachim Schoeberl <joachim.schoeberl@rwth-aachen.de>
+Joachim Schoeberl <joachim.schoeberl@tuwien.ac.at>
diff --git a/libsrc/csg/Makefile.am b/libsrc/csg/Makefile.am
index 5f883562..f1e91c74 100644
--- a/libsrc/csg/Makefile.am
+++ b/libsrc/csg/Makefile.am
@@ -22,9 +22,7 @@ libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp
 
 
 libcsgvis_la_LIBADD = libcsg.la
-libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la \
-	$(top_builddir)/libsrc/gprim/libgprim.la \
-	$(top_builddir)/libsrc/linalg/libla.la \
-	$(top_builddir)/libsrc/general/libgen.la 
+# libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la 
+
 
 
diff --git a/libsrc/stlgeom/Makefile.am b/libsrc/stlgeom/Makefile.am
index c9310292..95f8cd2f 100644
--- a/libsrc/stlgeom/Makefile.am
+++ b/libsrc/stlgeom/Makefile.am
@@ -11,12 +11,14 @@ libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \
 
 
 libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp
-libstlvis_la_LIBADD = libstl.la 
-#$(top_builddir)/libsrc/linalg/libla.la 
+libstlvis_la_LIBADD = libstl.la
+# $(top_builddir)/libsrc/linalg/libla.la 
+
+# libstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la \
+#	$(top_builddir)/libsrc/gprim/libgprim.la \
+#	$(top_builddir)/libsrc/linalg/libla.la \
+#	$(top_builddir)/libsrc/general/libgen.la 
+
 
-libstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la \
-	$(top_builddir)/libsrc/gprim/libgprim.la \
-	$(top_builddir)/libsrc/linalg/libla.la \
-	$(top_builddir)/libsrc/general/libgen.la 
 
 
diff --git a/ng/Makefile.am b/ng/Makefile.am
index 3797b559..88aa0c96 100644
--- a/ng/Makefile.am
+++ b/ng/Makefile.am
@@ -8,6 +8,7 @@ netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cp
 
 netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
 	$(top_builddir)/libsrc/csg/libcsgvis.la \
+	$(top_builddir)/libsrc/csg/libcsg.la \
 	$(top_builddir)/libsrc/interface/libinterface.la \
 	$(top_builddir)/libsrc/meshing/libmesh.la \
 	$(top_builddir)/libsrc/gprim/libgprim.la \
@@ -21,6 +22,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
 #	$(top_builddir)/libsrc/stlgeom/libstl.la 
 #	$(top_builddir)/libsrc/geom2d/libgeom2d.la 
 #	$(top_builddir)/libsrc/geom2d/libgeom2dvis.la 
+#	$(top_builddir)/libsrc/csg/libcsg.la 
 
 
 # add for static linkage of ngsolve:
@@ -33,7 +35,8 @@ ngvisual.tcl sockets.tcl drawing.tcl nghelp.tcl ngshell.tcl	  \
 ngtesting.tcl parameters.tcl variables.tcl csgeom.tcl stlgeom.tcl \
 occgeom.tcl acisgeom.tcl netgen.ocf
 
-netgen_LDFLAGS = -rdynamic  -static
+netgen_LDFLAGS = -rdynamic
+#  -static
 
 
 
diff --git a/ng/stlgeom.tcl b/ng/stlgeom.tcl
index bdf28303..0f95572c 100644
--- a/ng/stlgeom.tcl
+++ b/ng/stlgeom.tcl
@@ -1,6 +1,6 @@
 if { [catch { load libstlvis[info sharedlibextension] Ng_STL } result ] } {
-#    puts "cannot load stl" 
-#    puts "error: $result"
+    puts "cannot load stl" 
+    puts "error: $result"
 }