netgen-4.9 makefiles

This commit is contained in:
Joachim Schoeberl 2012-06-11 22:00:40 +00:00
parent 0f327a7b85
commit 923aec0182
4 changed files with 5 additions and 21 deletions

View File

@ -1,4 +1,4 @@
AC_INIT([netgen],[5.0-dev],[],[])
AC_INIT([netgen],[4.9.14],[],[])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_MACRO_DIR([m4])

View File

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

View File

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

View File

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