makefile fixes

This commit is contained in:
Joachim Schoeberl 2012-06-27 09:19:55 +00:00
parent a723b6bb08
commit e401714e73
5 changed files with 12 additions and 6 deletions

View File

@ -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])

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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