diff --git a/libsrc/csg/Makefile.am b/libsrc/csg/Makefile.am index f1e91c74..acf35b00 100644 --- a/libsrc/csg/Makefile.am +++ b/libsrc/csg/Makefile.am @@ -22,7 +22,5 @@ libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp libcsgvis_la_LIBADD = libcsg.la -# libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la - - +# $(top_builddir)/libsrc/geom2d/libgeom2d.la diff --git a/libsrc/stlgeom/Makefile.am b/libsrc/stlgeom/Makefile.am index 95f8cd2f..c8ea07aa 100644 --- a/libsrc/stlgeom/Makefile.am +++ b/libsrc/stlgeom/Makefile.am @@ -11,14 +11,5 @@ 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 - -# 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 - - - +libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la diff --git a/ng/Makefile.am b/ng/Makefile.am index 88aa0c96..9ec916b7 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -8,13 +8,12 @@ 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 \ $(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/general/libgen.la \ - -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) + -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) # # $(top_builddir)/libsrc/occ/liboccvis.la # $(top_builddir)/libsrc/occ/libocc.la @@ -22,7 +21,6 @@ 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: @@ -35,9 +33,6 @@ 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