undo lib dependencies

This commit is contained in:
Joachim Schoeberl 2012-06-11 20:19:06 +00:00
parent d3dba40556
commit 0aee7bc25d
5 changed files with 17 additions and 14 deletions

View File

@ -1 +1 @@
Joachim Schoeberl <joachim.schoeberl@rwth-aachen.de> Joachim Schoeberl <joachim.schoeberl@tuwien.ac.at>

View File

@ -22,9 +22,7 @@ libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp
libcsgvis_la_LIBADD = libcsg.la libcsgvis_la_LIBADD = libcsg.la
libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.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

View File

@ -11,12 +11,14 @@ libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \
libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp
libstlvis_la_LIBADD = libstl.la libstlvis_la_LIBADD = libstl.la
#$(top_builddir)/libsrc/linalg/libla.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

View File

@ -8,6 +8,7 @@ netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cp
netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
$(top_builddir)/libsrc/csg/libcsgvis.la \ $(top_builddir)/libsrc/csg/libcsgvis.la \
$(top_builddir)/libsrc/csg/libcsg.la \
$(top_builddir)/libsrc/interface/libinterface.la \ $(top_builddir)/libsrc/interface/libinterface.la \
$(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/meshing/libmesh.la \
$(top_builddir)/libsrc/gprim/libgprim.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/stlgeom/libstl.la
# $(top_builddir)/libsrc/geom2d/libgeom2d.la # $(top_builddir)/libsrc/geom2d/libgeom2d.la
# $(top_builddir)/libsrc/geom2d/libgeom2dvis.la # $(top_builddir)/libsrc/geom2d/libgeom2dvis.la
# $(top_builddir)/libsrc/csg/libcsg.la
# add for static linkage of ngsolve: # 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 \ ngtesting.tcl parameters.tcl variables.tcl csgeom.tcl stlgeom.tcl \
occgeom.tcl acisgeom.tcl netgen.ocf occgeom.tcl acisgeom.tcl netgen.ocf
netgen_LDFLAGS = -rdynamic -static netgen_LDFLAGS = -rdynamic
# -static

View File

@ -1,6 +1,6 @@
if { [catch { load libstlvis[info sharedlibextension] Ng_STL } result ] } { if { [catch { load libstlvis[info sharedlibextension] Ng_STL } result ] } {
# puts "cannot load stl" puts "cannot load stl"
# puts "error: $result" puts "error: $result"
} }