diff --git a/configure.ac b/configure.ac index feb92745..93460aef 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([netgen],[4.9.14],[],[]) +AC_INIT([netgen],[4.9.14-RC],[],[]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/libsrc/csg/Makefile.am b/libsrc/csg/Makefile.am index acf35b00..99a38c0b 100644 --- a/libsrc/csg/Makefile.am +++ b/libsrc/csg/Makefile.am @@ -22,5 +22,6 @@ libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp libcsgvis_la_LIBADD = libcsg.la -# $(top_builddir)/libsrc/geom2d/libgeom2d.la +libcsg_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la + diff --git a/libsrc/meshing/Makefile.am b/libsrc/meshing/Makefile.am index 2ff94a95..c4ca1ec0 100644 --- a/libsrc/meshing/Makefile.am +++ b/libsrc/meshing/Makefile.am @@ -29,3 +29,7 @@ libmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ smoothing2.cpp smoothing3.cpp specials.cpp tetrarls.cpp \ topology.cpp triarls.cpp validate.cpp zrefine.cpp bcfunctions.cpp \ parallelmesh.cpp paralleltop.cpp paralleltop.hpp basegeom.cpp + +libmesh_la_LIBADD = $(top_builddir)/libsrc/linalg/libla.la \ + $(top_builddir)/libsrc/gprim/libgprim.la \ + $(top_builddir)/libsrc/general/libgen.la diff --git a/libsrc/stlgeom/Makefile.am b/libsrc/stlgeom/Makefile.am index c8ea07aa..665b0556 100644 --- a/libsrc/stlgeom/Makefile.am +++ b/libsrc/stlgeom/Makefile.am @@ -11,5 +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 +libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/meshing/libmesh.la diff --git a/nglib/Makefile.am b/nglib/Makefile.am index 8f8fb6e9..5400c0a7 100644 --- a/nglib/Makefile.am +++ b/nglib/Makefile.am @@ -14,11 +14,12 @@ libnglib_la_LIBADD = \ $(top_builddir)/libsrc/stlgeom/libstl.la \ $(top_builddir)/libsrc/occ/libocc.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 \ $(OCCLIBS) $(MPI_LIBS) +# $(top_builddir)/libsrc/gprim/libgprim.la \ +# $(top_builddir)/libsrc/linalg/libla.la \ +# $(top_builddir)/libsrc/general/libgen.la + libnglib_la_LDFLAGS = -avoid-version # -rdynamic