diff --git a/libsrc/csg/Makefile.am b/libsrc/csg/Makefile.am index 8c596b11..70d6508d 100644 --- a/libsrc/csg/Makefile.am +++ b/libsrc/csg/Makefile.am @@ -25,9 +25,10 @@ libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la if NGGUI lib_LTLIBRARIES += libcsgvis.la -libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp +libcsgvis_la_SOURCES = csgpkg.cpp libcsgvis_la_LIBADD = libcsg.la $(top_builddir)/libsrc/visualization/libvisual.la +libcsg_la_SOURCES += vscsg.cpp +libcsg_la_LIBADD += $(top_builddir)/libsrc/visualization/libvisual.la endif -# $(top_builddir)/libsrc/geom2d/libgeom2d.la diff --git a/libsrc/stlgeom/Makefile.am b/libsrc/stlgeom/Makefile.am index bbe009c1..eb34f52a 100644 --- a/libsrc/stlgeom/Makefile.am +++ b/libsrc/stlgeom/Makefile.am @@ -6,16 +6,20 @@ METASOURCES = AUTO lib_LTLIBRARIES = libstl.la -if NGGUI -lib_LTLIBRARIES += libstlvis.la -libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp -libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/visualization/libvisual.la -endif libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp libstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la -# libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la + + + +if NGGUI +lib_LTLIBRARIES += libstlvis.la +libstlvis_la_SOURCES = stlpkg.cpp +libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/visualization/libvisual.la +libstl_la_SOURCES += vsstl.cpp +libstl_la_LIBADD += $(top_builddir)/libsrc/visualization/libvisual.la +endif diff --git a/ng/Makefile.am b/ng/Makefile.am index d2c04fb3..83fc17e9 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -52,12 +52,9 @@ libngpy_la_SOURCES = netgenpy.cpp libngpy_la_LDFLAGS = -avoid-version -module libngpy_la_LIBADD = $(top_builddir)/libsrc/visualization/libvisual.la \ - $(top_builddir)/libsrc/csg/libcsgvis.la \ $(top_builddir)/libsrc/csg/libcsg.la \ - $(top_builddir)/libsrc/stlgeom/libstlvis.la \ $(top_builddir)/libsrc/stlgeom/libstl.la \ $(top_builddir)/libsrc/geom2d/libgeom2d.la \ - $(top_builddir)/libsrc/geom2d/libgeom2dvis.la \ $(top_builddir)/libsrc/interface/libinterface.la \ $(top_builddir)/libsrc/meshing/libmesh.la