From 0bae83e1f67f3e07d5ac53d04e2f5b41e8cfba4b Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Sun, 18 Jan 2009 14:47:12 +0000 Subject: [PATCH] build Netgen - library --- Makefile.am | 2 +- Makefile.in | 2 +- configure | 344 +++++----- configure.ac | 34 +- libsrc/csg/Makefile.am | 4 +- libsrc/csg/Makefile.in | 95 ++- libsrc/general/Makefile.am | 4 +- libsrc/general/Makefile.in | 80 +-- libsrc/geom2d/Makefile.am | 4 +- libsrc/geom2d/Makefile.in | 50 +- libsrc/gprim/Makefile.am | 4 +- libsrc/gprim/Makefile.in | 55 +- libsrc/include/Makefile.am | 2 + libsrc/include/Makefile.in | 53 +- libsrc/{interface => include}/nginterface.h | 0 libsrc/interface/Makefile.am | 7 +- libsrc/interface/Makefile.in | 145 ++--- libsrc/interface/printdest.cpp | 11 - libsrc/interface/writeuser.hpp | 4 - libsrc/linalg/Makefile.am | 6 +- libsrc/linalg/Makefile.in | 51 +- libsrc/meshing/Makefile.am | 8 +- libsrc/meshing/Makefile.in | 153 +++-- libsrc/occ/Makefile.am | 4 +- libsrc/occ/Makefile.in | 67 +- libsrc/opti/Makefile.am | 4 +- libsrc/opti/Makefile.in | 47 +- libsrc/stlgeom/Makefile.am | 4 +- libsrc/stlgeom/Makefile.in | 57 +- libsrc/visualization/Makefile.am | 2 +- libsrc/visualization/Makefile.in | 6 +- .../importsolution.cpp | 4 +- libsrc/visualization/vssolution.hpp | 3 + ng/Makefile.am | 19 +- ng/Makefile.in | 43 +- {libsrc/interface => ng}/nginterface.cpp | 0 nglib/Makefile.am | 45 ++ nglib/ng_vol.cpp | 95 +++ nglib/nglib.cpp | 593 ++++++++++++++++++ nglib/nglib.h | 221 +++++++ 40 files changed, 1662 insertions(+), 670 deletions(-) rename libsrc/{interface => include}/nginterface.h (100%) delete mode 100644 libsrc/interface/printdest.cpp rename libsrc/{interface => visualization}/importsolution.cpp (98%) rename {libsrc/interface => ng}/nginterface.cpp (100%) create mode 100644 nglib/Makefile.am create mode 100644 nglib/ng_vol.cpp create mode 100644 nglib/nglib.cpp create mode 100644 nglib/nglib.h diff --git a/Makefile.am b/Makefile.am index 0af4152d..f339a133 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 METASOURCES = AUTO -SUBDIRS = libsrc ng tutorials +SUBDIRS = libsrc ng nglib tutorials diff --git a/Makefile.in b/Makefile.in index 9608265a..4ea96aa8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -230,7 +230,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 METASOURCES = AUTO -SUBDIRS = libsrc ng tutorials +SUBDIRS = libsrc ng nglib tutorials all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/configure b/configure index 09134843..19a4259d 100755 --- a/configure +++ b/configure @@ -789,6 +789,8 @@ LIBOBJS TOGLLIBDIR OCCLIBS OCCFLAGS +NGLIB_FALSE +NGLIB_TRUE CXXCPP CPP OTOOL64 @@ -797,6 +799,7 @@ LIPO NMEDIT DSYMUTIL lt_ECHO +RANLIB AR OBJDUMP LN_S @@ -823,7 +826,6 @@ build_vendor build_cpu build LIBTOOL -RANLIB am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE @@ -945,9 +947,10 @@ with_tclinclude enable_occ with_occ with_togl +enable_nglib +enable_static enable_dependency_tracking enable_shared -enable_static with_pic enable_fast_install with_gnu_ld @@ -1597,10 +1600,11 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-occ compile with OpenCascade geometry kernel + --enable-nglib generate shared library nglib + --enable-static[=PKGS] build static libraries [default=no] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -2574,6 +2578,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +# Tcl/Tk configuration: + # TEA extensions pass this us the version of TEA they think they # are compatible with. @@ -3210,15 +3216,6 @@ $as_echo "${ac_cv_c_tclh}" >&6; } -# TEA_PATH_TOGLCONFIG -# TEA_LOAD_TOGLCONFIG - -# TEA_PATH_TIXCONFIG -# TEA_LOAD_TIXCONFIG - -# TEA_PREFIX -# TEA_SETUP_COMPILER - # Check whether --enable-occ was given. if test "${enable_occ+set}" = set; then @@ -3240,6 +3237,7 @@ fi + # Check whether --with-togl was given. if test "${with_togl+set}" = set; then withval=$with_togl; togldir=$withval @@ -3251,11 +3249,52 @@ fi +# Check whether --enable-nglib was given. +if test "${enable_nglib+set}" = set; then + enableval=$enable_nglib; nglibon=true +else + nglibon=false +fi + + + # AC_HEADER_STDC ac_config_headers="$ac_config_headers config.h" +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=no +fi + + + + + + + + + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4054,98 +4093,6 @@ else fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - case `pwd` in *\ * | *\ *) { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -5639,13 +5586,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5642: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5589: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5645: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5592: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5648: output\"" >&5) + (eval echo "\"\$as_me:5595: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6851,7 +6798,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6854 "configure"' > conftest.$ac_ext + echo '#line 6801 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8968,36 +8915,6 @@ fi - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - - - - - - - # Check whether --with-pic was given. @@ -9427,11 +9344,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9430: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9347: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9434: \$? = $ac_status" >&5 + echo "$as_me:9351: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9766,11 +9683,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9769: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9686: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9773: \$? = $ac_status" >&5 + echo "$as_me:9690: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9871,11 +9788,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9874: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9791: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9878: \$? = $ac_status" >&5 + echo "$as_me:9795: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9926,11 +9843,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9929: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9846: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9933: \$? = $ac_status" >&5 + echo "$as_me:9850: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12726,7 +12643,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12729 "configure" +#line 12646 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12822,7 +12739,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12825 "configure" +#line 12742 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14842,11 +14759,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14845: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14762: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14849: \$? = $ac_status" >&5 + echo "$as_me:14766: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14941,11 +14858,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14944: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14861: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14948: \$? = $ac_status" >&5 + echo "$as_me:14865: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14993,11 +14910,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14996: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14913: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15000: \$? = $ac_status" >&5 + echo "$as_me:14917: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15977,9 +15894,110 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Only expand once: +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + + # AM_CONDITIONAL([OCC], [test x$occon = xtrue]) + if test x$nglibon = xtrue; then + NGLIB_TRUE= + NGLIB_FALSE='#' +else + NGLIB_TRUE='#' + NGLIB_FALSE= +fi + # AC_SUBST([OCCFLAGS], [$occfl]) OCCFLAGS="$occfl $occincfl" @@ -17313,7 +17331,7 @@ done -ac_config_files="$ac_config_files Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile libsrc/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/opti/Makefile libsrc/parallel/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile tutorials/Makefile" +ac_config_files="$ac_config_files Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile libsrc/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/opti/Makefile libsrc/parallel/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile nglib/Makefile tutorials/Makefile" cat >confcache <<\_ACEOF @@ -17441,6 +17459,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${NGLIB_TRUE}" && test -z "${NGLIB_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"NGLIB\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"NGLIB\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -17949,10 +17974,10 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' @@ -18319,6 +18344,7 @@ do "libsrc/stlgeom/Makefile") CONFIG_FILES="$CONFIG_FILES libsrc/stlgeom/Makefile" ;; "libsrc/visualization/Makefile") CONFIG_FILES="$CONFIG_FILES libsrc/visualization/Makefile" ;; "ng/Makefile") CONFIG_FILES="$CONFIG_FILES ng/Makefile" ;; + "nglib/Makefile") CONFIG_FILES="$CONFIG_FILES nglib/Makefile" ;; "tutorials/Makefile") CONFIG_FILES="$CONFIG_FILES tutorials/Makefile" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -19151,6 +19177,9 @@ available_tags="CXX " # ### BEGIN LIBTOOL CONFIG +# Whether or not to build static libraries. +build_old_libs=$enable_static + # Which release of libtool.m4 was used? macro_version=$macro_version macro_revision=$macro_revision @@ -19158,9 +19187,6 @@ macro_revision=$macro_revision # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static - # What type of objects to build. pic_mode=$pic_mode diff --git a/configure.ac b/configure.ac index 071a7605..66a5e52f 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,8 @@ AC_CONFIG_MACRO_DIR([m4]) AC_PREFIX_DEFAULT(["/opt/netgen"]) +# Tcl/Tk configuration: + TEA_INIT([3.6]) TEA_PATH_TCLCONFIG @@ -18,15 +20,6 @@ TEA_PUBLIC_TCL_HEADERS -# TEA_PATH_TOGLCONFIG -# TEA_LOAD_TOGLCONFIG - -# TEA_PATH_TIXCONFIG -# TEA_LOAD_TIXCONFIG - -# TEA_PREFIX -# TEA_SETUP_COMPILER - AC_ARG_ENABLE([occ], [ --enable-occ compile with OpenCascade geometry kernel], @@ -42,6 +35,7 @@ AC_ARG_WITH([occ], [occlibfl="-L$withval/lib"], ) + AC_ARG_WITH([togl], [ --with-togl=dir directory containing libTogl1.7], [togldir=$withval] @@ -50,17 +44,27 @@ AC_ARG_WITH([togl], ) +AC_ARG_ENABLE([nglib], + [ --enable-nglib generate shared library nglib], + [ nglibon=true ], + [ nglibon=false ]) + + # AC_HEADER_STDC AC_CONFIG_HEADERS(config.h) +AC_DISABLE_STATIC + AC_LANG([C++]) AC_PROG_CXX +AC_PROG_LIBTOOL AC_PROG_RANLIB LT_INIT # AM_CONDITIONAL([OCC], [test x$occon = xtrue]) +AM_CONDITIONAL([NGLIB], [test x$nglibon = xtrue]) # AC_SUBST([OCCFLAGS], [$occfl]) AC_SUBST([OCCFLAGS], ["$occfl $occincfl"]) @@ -91,10 +95,12 @@ AC_CHECK_HEADERS([limits.h]) AC_CHECK_FUNCS([minabc]) -AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile libsrc/general/Makefile \ -libsrc/geom2d/Makefile libsrc/gprim/Makefile libsrc/include/Makefile libsrc/interface/Makefile \ -libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile libsrc/opti/Makefile \ -libsrc/parallel/Makefile libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile \ -tutorials/Makefile) +AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile +libsrc/general/Makefile libsrc/geom2d/Makefile libsrc/gprim/Makefile +libsrc/include/Makefile libsrc/interface/Makefile +libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile +libsrc/opti/Makefile libsrc/parallel/Makefile +libsrc/stlgeom/Makefile libsrc/visualization/Makefile ng/Makefile +nglib/Makefile tutorials/Makefile) AC_OUTPUT diff --git a/libsrc/csg/Makefile.am b/libsrc/csg/Makefile.am index 2bdc3372..ff0b3f3c 100644 --- a/libsrc/csg/Makefile.am +++ b/libsrc/csg/Makefile.am @@ -7,8 +7,8 @@ revolution.hpp spline3d.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libcsg.a -libcsg_a_SOURCES = algprim.cpp brick.cpp \ +noinst_LTLIBRARIES = libcsg.la +libcsg_la_SOURCES = algprim.cpp brick.cpp \ bspline2d.cpp csgeom.cpp csgparser.cpp curve2d.cpp edgeflw.cpp \ explicitcurve2d.cpp extrusion.cpp gencyl.cpp genmesh.cpp identify.cpp \ manifold.cpp meshsurf.cpp polyhedra.cpp revolution.cpp singularref.cpp \ diff --git a/libsrc/csg/Makefile.in b/libsrc/csg/Makefile.in index cb7be4a0..eb5cd6f2 100644 --- a/libsrc/csg/Makefile.in +++ b/libsrc/csg/Makefile.in @@ -46,19 +46,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libcsg_a_AR = $(AR) $(ARFLAGS) -libcsg_a_LIBADD = -am_libcsg_a_OBJECTS = algprim.$(OBJEXT) brick.$(OBJEXT) \ - bspline2d.$(OBJEXT) csgeom.$(OBJEXT) csgparser.$(OBJEXT) \ - curve2d.$(OBJEXT) edgeflw.$(OBJEXT) explicitcurve2d.$(OBJEXT) \ - extrusion.$(OBJEXT) gencyl.$(OBJEXT) genmesh.$(OBJEXT) \ - identify.$(OBJEXT) manifold.$(OBJEXT) meshsurf.$(OBJEXT) \ - polyhedra.$(OBJEXT) revolution.$(OBJEXT) singularref.$(OBJEXT) \ - solid.$(OBJEXT) specpoin.$(OBJEXT) spline3d.$(OBJEXT) \ - surface.$(OBJEXT) triapprox.$(OBJEXT) -libcsg_a_OBJECTS = $(am_libcsg_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libcsg_la_LIBADD = +am_libcsg_la_OBJECTS = algprim.lo brick.lo bspline2d.lo csgeom.lo \ + csgparser.lo curve2d.lo edgeflw.lo explicitcurve2d.lo \ + extrusion.lo gencyl.lo genmesh.lo identify.lo manifold.lo \ + meshsurf.lo polyhedra.lo revolution.lo singularref.lo solid.lo \ + specpoin.lo spline3d.lo surface.lo triapprox.lo +libcsg_la_OBJECTS = $(am_libcsg_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -71,8 +66,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libcsg_a_SOURCES) -DIST_SOURCES = $(libcsg_a_SOURCES) +SOURCES = $(libcsg_la_SOURCES) +DIST_SOURCES = $(libcsg_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -239,8 +234,8 @@ revolution.hpp spline3d.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libcsg.a -libcsg_a_SOURCES = algprim.cpp brick.cpp \ +noinst_LTLIBRARIES = libcsg.la +libcsg_la_SOURCES = algprim.cpp brick.cpp \ bspline2d.cpp csgeom.cpp csgparser.cpp curve2d.cpp edgeflw.cpp \ explicitcurve2d.cpp extrusion.cpp gencyl.cpp genmesh.cpp identify.cpp \ manifold.cpp meshsurf.cpp polyhedra.cpp revolution.cpp singularref.cpp \ @@ -280,12 +275,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libcsg.a: $(libcsg_a_OBJECTS) $(libcsg_a_DEPENDENCIES) - -rm -f libcsg.a - $(libcsg_a_AR) libcsg.a $(libcsg_a_OBJECTS) $(libcsg_a_LIBADD) - $(RANLIB) libcsg.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libcsg.la: $(libcsg_la_OBJECTS) $(libcsg_la_DEPENDENCIES) + $(CXXLINK) $(libcsg_la_OBJECTS) $(libcsg_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -293,28 +292,28 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/algprim.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brick.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bspline2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csgeom.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csgparser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edgeflw.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/explicitcurve2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extrusion.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gencyl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genmesh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/identify.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manifold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshsurf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polyhedra.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/revolution.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singularref.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specpoin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spline3d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surface.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triapprox.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/algprim.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brick.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bspline2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csgeom.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csgparser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edgeflw.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/explicitcurve2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extrusion.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gencyl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genmesh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/identify.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manifold.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshsurf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polyhedra.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/revolution.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singularref.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specpoin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spline3d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triapprox.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -418,7 +417,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -446,7 +445,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -506,7 +505,7 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/general/Makefile.am b/libsrc/general/Makefile.am index dcb13353..27787a53 100644 --- a/libsrc/general/Makefile.am +++ b/libsrc/general/Makefile.am @@ -4,7 +4,7 @@ include_HEADERS = dynamicmem.hpp moveablemem.hpp parthreads.hpp ngexception.hp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libgeneral.a -libgeneral_a_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ +noinst_LTLIBRARIES = libgeneral.la +libgeneral_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ hashtabl.cpp moveablemem.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp diff --git a/libsrc/general/Makefile.in b/libsrc/general/Makefile.in index 954bc778..dc690bdf 100644 --- a/libsrc/general/Makefile.in +++ b/libsrc/general/Makefile.in @@ -46,17 +46,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libgeneral_a_AR = $(AR) $(ARFLAGS) -libgeneral_a_LIBADD = -am_libgeneral_a_OBJECTS = array.$(OBJEXT) bitarray.$(OBJEXT) \ - dynamicmem.$(OBJEXT) flags.$(OBJEXT) hashtabl.$(OBJEXT) \ - moveablemem.$(OBJEXT) mystring.$(OBJEXT) ngexception.$(OBJEXT) \ - optmem.$(OBJEXT) parthreads.$(OBJEXT) profiler.$(OBJEXT) \ - seti.$(OBJEXT) sort.$(OBJEXT) spbita2d.$(OBJEXT) \ - symbolta.$(OBJEXT) table.$(OBJEXT) -libgeneral_a_OBJECTS = $(am_libgeneral_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libgeneral_la_LIBADD = +am_libgeneral_la_OBJECTS = array.lo bitarray.lo dynamicmem.lo flags.lo \ + hashtabl.lo moveablemem.lo mystring.lo ngexception.lo \ + optmem.lo parthreads.lo profiler.lo seti.lo sort.lo \ + spbita2d.lo symbolta.lo table.lo +libgeneral_la_OBJECTS = $(am_libgeneral_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -69,8 +65,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libgeneral_a_SOURCES) -DIST_SOURCES = $(libgeneral_a_SOURCES) +SOURCES = $(libgeneral_la_SOURCES) +DIST_SOURCES = $(libgeneral_la_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -241,8 +237,8 @@ noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp include_HEADERS = dynamicmem.hpp moveablemem.hpp parthreads.hpp ngexception.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libgeneral.a -libgeneral_a_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ +noinst_LTLIBRARIES = libgeneral.la +libgeneral_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ hashtabl.cpp moveablemem.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp @@ -280,12 +276,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libgeneral.a: $(libgeneral_a_OBJECTS) $(libgeneral_a_DEPENDENCIES) - -rm -f libgeneral.a - $(libgeneral_a_AR) libgeneral.a $(libgeneral_a_OBJECTS) $(libgeneral_a_LIBADD) - $(RANLIB) libgeneral.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libgeneral.la: $(libgeneral_la_OBJECTS) $(libgeneral_la_DEPENDENCIES) + $(CXXLINK) $(libgeneral_la_OBJECTS) $(libgeneral_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -293,22 +293,22 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitarray.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamicmem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flags.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtabl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/moveablemem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mystring.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngexception.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optmem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parthreads.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profiler.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seti.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spbita2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symbolta.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitarray.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamicmem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flags.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtabl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/moveablemem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mystring.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngexception.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optmem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parthreads.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profiler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seti.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spbita2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symbolta.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -429,7 +429,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -460,7 +460,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -520,7 +520,7 @@ uninstall-am: uninstall-includeHEADERS .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/geom2d/Makefile.am b/libsrc/geom2d/Makefile.am index 9214056e..2e2c30af 100644 --- a/libsrc/geom2d/Makefile.am +++ b/libsrc/geom2d/Makefile.am @@ -2,6 +2,6 @@ noinst_HEADERS = geom2dmesh.hpp spline2d.hpp splinegeometry.hpp spline.hpp geo AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libgeom2d.a -libgeom2d_a_SOURCES = genmesh2d.cpp geom2dmesh.cpp spline.cpp \ +noinst_LTLIBRARIES = libgeom2d.la +libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp spline.cpp \ splinegeometry.cpp diff --git a/libsrc/geom2d/Makefile.in b/libsrc/geom2d/Makefile.in index 6ae2c18c..f04691a4 100644 --- a/libsrc/geom2d/Makefile.in +++ b/libsrc/geom2d/Makefile.in @@ -46,13 +46,11 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libgeom2d_a_AR = $(AR) $(ARFLAGS) -libgeom2d_a_LIBADD = -am_libgeom2d_a_OBJECTS = genmesh2d.$(OBJEXT) geom2dmesh.$(OBJEXT) \ - spline.$(OBJEXT) splinegeometry.$(OBJEXT) -libgeom2d_a_OBJECTS = $(am_libgeom2d_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libgeom2d_la_LIBADD = +am_libgeom2d_la_OBJECTS = genmesh2d.lo geom2dmesh.lo spline.lo \ + splinegeometry.lo +libgeom2d_la_OBJECTS = $(am_libgeom2d_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -65,8 +63,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libgeom2d_a_SOURCES) -DIST_SOURCES = $(libgeom2d_a_SOURCES) +SOURCES = $(libgeom2d_la_SOURCES) +DIST_SOURCES = $(libgeom2d_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -228,8 +226,8 @@ top_srcdir = @top_srcdir@ noinst_HEADERS = geom2dmesh.hpp spline2d.hpp splinegeometry.hpp spline.hpp geometry2d.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libgeom2d.a -libgeom2d_a_SOURCES = genmesh2d.cpp geom2dmesh.cpp spline.cpp \ +noinst_LTLIBRARIES = libgeom2d.la +libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp spline.cpp \ splinegeometry.cpp all: all-am @@ -266,12 +264,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libgeom2d.a: $(libgeom2d_a_OBJECTS) $(libgeom2d_a_DEPENDENCIES) - -rm -f libgeom2d.a - $(libgeom2d_a_AR) libgeom2d.a $(libgeom2d_a_OBJECTS) $(libgeom2d_a_LIBADD) - $(RANLIB) libgeom2d.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libgeom2d.la: $(libgeom2d_la_OBJECTS) $(libgeom2d_la_DEPENDENCIES) + $(CXXLINK) $(libgeom2d_la_OBJECTS) $(libgeom2d_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -279,10 +281,10 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genmesh2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geom2dmesh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spline.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splinegeometry.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genmesh2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geom2dmesh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spline.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splinegeometry.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -386,7 +388,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -414,7 +416,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -474,7 +476,7 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/gprim/Makefile.am b/libsrc/gprim/Makefile.am index 6bb5638c..ed680a05 100644 --- a/libsrc/gprim/Makefile.am +++ b/libsrc/gprim/Makefile.am @@ -2,6 +2,6 @@ noinst_HEADERS = adtree.hpp geom3d.hpp geomobjects2.hpp geomops2.hpp geom AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libgprim.a -libgprim_a_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ +noinst_LTLIBRARIES = libgprim.la +libgprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ geomtest3d.cpp transform3d.cpp diff --git a/libsrc/gprim/Makefile.in b/libsrc/gprim/Makefile.in index 1aca4929..d9cec928 100644 --- a/libsrc/gprim/Makefile.in +++ b/libsrc/gprim/Makefile.in @@ -46,14 +46,11 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libgprim_a_AR = $(AR) $(ARFLAGS) -libgprim_a_LIBADD = -am_libgprim_a_OBJECTS = adtree.$(OBJEXT) geom2d.$(OBJEXT) \ - geom3d.$(OBJEXT) geomfuncs.$(OBJEXT) geomtest3d.$(OBJEXT) \ - transform3d.$(OBJEXT) -libgprim_a_OBJECTS = $(am_libgprim_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libgprim_la_LIBADD = +am_libgprim_la_OBJECTS = adtree.lo geom2d.lo geom3d.lo geomfuncs.lo \ + geomtest3d.lo transform3d.lo +libgprim_la_OBJECTS = $(am_libgprim_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -66,8 +63,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libgprim_a_SOURCES) -DIST_SOURCES = $(libgprim_a_SOURCES) +SOURCES = $(libgprim_la_SOURCES) +DIST_SOURCES = $(libgprim_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -229,8 +226,8 @@ top_srcdir = @top_srcdir@ noinst_HEADERS = adtree.hpp geom3d.hpp geomobjects2.hpp geomops2.hpp geomtest3d.hpp transform3d.hpp geom2d.hpp geomfuncs.hpp geomobjects.hpp geomops.hpp gprim.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libgprim.a -libgprim_a_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ +noinst_LTLIBRARIES = libgprim.la +libgprim_la_SOURCES = adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp \ geomtest3d.cpp transform3d.cpp all: all-am @@ -267,12 +264,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libgprim.a: $(libgprim_a_OBJECTS) $(libgprim_a_DEPENDENCIES) - -rm -f libgprim.a - $(libgprim_a_AR) libgprim.a $(libgprim_a_OBJECTS) $(libgprim_a_LIBADD) - $(RANLIB) libgprim.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libgprim.la: $(libgprim_la_OBJECTS) $(libgprim_la_DEPENDENCIES) + $(CXXLINK) $(libgprim_la_OBJECTS) $(libgprim_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -280,12 +281,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adtree.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geom2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geom3d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geomfuncs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geomtest3d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transform3d.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adtree.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geom2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geom3d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geomfuncs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geomtest3d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/transform3d.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -389,7 +390,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -417,7 +418,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -477,7 +478,7 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/include/Makefile.am b/libsrc/include/Makefile.am index 67660728..60cfbe60 100644 --- a/libsrc/include/Makefile.am +++ b/libsrc/include/Makefile.am @@ -3,5 +3,7 @@ stepgeom.hpp visual.hpp csg.hpp incvis.hpp myadt.hpp opti.hpp \ stepreader.hpp geometry2d.hpp linalg.hpp mydefs.hpp parallel.hpp \ stlgeom.hpp mystdlib.h +include_HEADERS = nginterface.h + AM_CPPFLAGS = METASOURCES = AUTO diff --git a/libsrc/include/Makefile.in b/libsrc/include/Makefile.in index d254069e..3b86051f 100644 --- a/libsrc/include/Makefile.in +++ b/libsrc/include/Makefile.in @@ -33,8 +33,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = libsrc/include -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -47,7 +47,15 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -HEADERS = $(noinst_HEADERS) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(includedir)" +includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(include_HEADERS) $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -210,6 +218,7 @@ stepgeom.hpp visual.hpp csg.hpp incvis.hpp myadt.hpp opti.hpp \ stepreader.hpp geometry2d.hpp linalg.hpp mydefs.hpp parallel.hpp \ stlgeom.hpp mystdlib.h +include_HEADERS = nginterface.h AM_CPPFLAGS = METASOURCES = AUTO all: all-am @@ -250,6 +259,23 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ + $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + done + +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(includedir)/$$f"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -328,6 +354,9 @@ check-am: all-am check: check-am all-am: Makefile $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -370,7 +399,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-includeHEADERS install-dvi: install-dvi-am @@ -404,7 +433,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-includeHEADERS .MAKE: install-am install-strip @@ -413,13 +442,13 @@ uninstall-am: distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am + install-exec-am install-html install-html-am \ + install-includeHEADERS install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libsrc/interface/nginterface.h b/libsrc/include/nginterface.h similarity index 100% rename from libsrc/interface/nginterface.h rename to libsrc/include/nginterface.h diff --git a/libsrc/interface/Makefile.am b/libsrc/interface/Makefile.am index 19ea2043..5da4d6c8 100644 --- a/libsrc/interface/Makefile.am +++ b/libsrc/interface/Makefile.am @@ -1,11 +1,10 @@ -include_HEADERS = nginterface.h +# include_HEADERS = nginterface.h noinst_HEADERS = writeuser.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(TCL_INCLUDES) -DOPENGL METASOURCES = AUTO -noinst_LIBRARIES = libinterface.a -libinterface_a_SOURCES = importsolution.cpp nginterface.cpp printdest.cpp \ - read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp \ +noinst_LTLIBRARIES = libinterface.la +libinterface_la_SOURCES = read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp \ writedolfin.cpp writeelmer.cpp writefeap.cpp writefluent.cpp writegmsh.cpp writejcm.cpp \ writepermas.cpp writetecplot.cpp writetet.cpp writetochnog.cpp writeuser.cpp \ wuchemnitz.cpp diff --git a/libsrc/interface/Makefile.in b/libsrc/interface/Makefile.in index 1ea8aa4b..aa87bd82 100644 --- a/libsrc/interface/Makefile.in +++ b/libsrc/interface/Makefile.in @@ -34,8 +34,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = libsrc/interface -DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -46,21 +46,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libinterface_a_AR = $(AR) $(ARFLAGS) -libinterface_a_LIBADD = -am_libinterface_a_OBJECTS = importsolution.$(OBJEXT) \ - nginterface.$(OBJEXT) printdest.$(OBJEXT) \ - read_fnf_mesh.$(OBJEXT) readtetmesh.$(OBJEXT) \ - readuser.$(OBJEXT) writeabaqus.$(OBJEXT) \ - writediffpack.$(OBJEXT) writedolfin.$(OBJEXT) \ - writeelmer.$(OBJEXT) writefeap.$(OBJEXT) writefluent.$(OBJEXT) \ - writegmsh.$(OBJEXT) writejcm.$(OBJEXT) writepermas.$(OBJEXT) \ - writetecplot.$(OBJEXT) writetet.$(OBJEXT) \ - writetochnog.$(OBJEXT) writeuser.$(OBJEXT) \ - wuchemnitz.$(OBJEXT) -libinterface_a_OBJECTS = $(am_libinterface_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libinterface_la_LIBADD = +am_libinterface_la_OBJECTS = read_fnf_mesh.lo readtetmesh.lo \ + readuser.lo writeabaqus.lo writediffpack.lo writedolfin.lo \ + writeelmer.lo writefeap.lo writefluent.lo writegmsh.lo \ + writejcm.lo writepermas.lo writetecplot.lo writetet.lo \ + writetochnog.lo writeuser.lo wuchemnitz.lo +libinterface_la_OBJECTS = $(am_libinterface_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -73,17 +66,9 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libinterface_a_SOURCES) -DIST_SOURCES = $(libinterface_a_SOURCES) -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(includedir)" -includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(include_HEADERS) $(noinst_HEADERS) +SOURCES = $(libinterface_la_SOURCES) +DIST_SOURCES = $(libinterface_la_SOURCES) +HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -241,13 +226,13 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -include_HEADERS = nginterface.h + +# include_HEADERS = nginterface.h noinst_HEADERS = writeuser.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(TCL_INCLUDES) -DOPENGL METASOURCES = AUTO -noinst_LIBRARIES = libinterface.a -libinterface_a_SOURCES = importsolution.cpp nginterface.cpp printdest.cpp \ - read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp \ +noinst_LTLIBRARIES = libinterface.la +libinterface_la_SOURCES = read_fnf_mesh.cpp readtetmesh.cpp readuser.cpp writeabaqus.cpp writediffpack.cpp \ writedolfin.cpp writeelmer.cpp writefeap.cpp writefluent.cpp writegmsh.cpp writejcm.cpp \ writepermas.cpp writetecplot.cpp writetet.cpp writetochnog.cpp writeuser.cpp \ wuchemnitz.cpp @@ -286,12 +271,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libinterface.a: $(libinterface_a_OBJECTS) $(libinterface_a_DEPENDENCIES) - -rm -f libinterface.a - $(libinterface_a_AR) libinterface.a $(libinterface_a_OBJECTS) $(libinterface_a_LIBADD) - $(RANLIB) libinterface.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libinterface.la: $(libinterface_la_OBJECTS) $(libinterface_la_DEPENDENCIES) + $(CXXLINK) $(libinterface_la_OBJECTS) $(libinterface_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -299,26 +288,23 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importsolution.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nginterface.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printdest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_fnf_mesh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readtetmesh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readuser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writeabaqus.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writediffpack.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writedolfin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writeelmer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writefeap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writefluent.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writegmsh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writejcm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writepermas.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writetecplot.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writetet.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writetochnog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writeuser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wuchemnitz.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_fnf_mesh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readtetmesh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readuser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writeabaqus.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writediffpack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writedolfin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writeelmer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writefeap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writefluent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writegmsh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writejcm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writepermas.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writetecplot.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writetet.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writetochnog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writeuser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wuchemnitz.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -346,23 +332,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ - done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -439,11 +408,8 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -470,7 +436,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -489,7 +455,7 @@ info: info-am info-am: -install-data-am: install-includeHEADERS +install-data-am: install-dvi: install-dvi-am @@ -525,23 +491,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-includeHEADERS +uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-includeHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-includeHEADERS + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libsrc/interface/printdest.cpp b/libsrc/interface/printdest.cpp deleted file mode 100644 index 0db654d9..00000000 --- a/libsrc/interface/printdest.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include - -namespace netgen -{ - //Destination for messages, errors, ... - void Ng_PrintDest(const char * s) - { - (*mycout) << s << flush; - } -} diff --git a/libsrc/interface/writeuser.hpp b/libsrc/interface/writeuser.hpp index d9be90ec..9265f30c 100644 --- a/libsrc/interface/writeuser.hpp +++ b/libsrc/interface/writeuser.hpp @@ -22,10 +22,6 @@ extern void ReadFile (Mesh & mesh, const string & filename); -extern -void ImportSolution (const char * filename); - - diff --git a/libsrc/linalg/Makefile.am b/libsrc/linalg/Makefile.am index da1dd338..77022183 100644 --- a/libsrc/linalg/Makefile.am +++ b/libsrc/linalg/Makefile.am @@ -1,5 +1,7 @@ noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libla.a -libla_a_SOURCES = densemat.cpp polynomial.cpp vector.cpp +noinst_LTLIBRARIES = libla.la +libla_la_SOURCES = densemat.cpp polynomial.cpp vector.cpp + +libla_la_LDFLAGS = -rdynamic diff --git a/libsrc/linalg/Makefile.in b/libsrc/linalg/Makefile.in index 29ff7baf..826f6e8d 100644 --- a/libsrc/linalg/Makefile.in +++ b/libsrc/linalg/Makefile.in @@ -46,13 +46,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libla_a_AR = $(AR) $(ARFLAGS) -libla_a_LIBADD = -am_libla_a_OBJECTS = densemat.$(OBJEXT) polynomial.$(OBJEXT) \ - vector.$(OBJEXT) -libla_a_OBJECTS = $(am_libla_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libla_la_LIBADD = +am_libla_la_OBJECTS = densemat.lo polynomial.lo vector.lo +libla_la_OBJECTS = $(am_libla_la_OBJECTS) +libla_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libla_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -65,8 +65,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libla_a_SOURCES) -DIST_SOURCES = $(libla_a_SOURCES) +SOURCES = $(libla_la_SOURCES) +DIST_SOURCES = $(libla_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -228,8 +228,9 @@ top_srcdir = @top_srcdir@ noinst_HEADERS = densemat.hpp linalg.hpp polynomial.hpp vector.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libla.a -libla_a_SOURCES = densemat.cpp polynomial.cpp vector.cpp +noinst_LTLIBRARIES = libla.la +libla_la_SOURCES = densemat.cpp polynomial.cpp vector.cpp +libla_la_LDFLAGS = -rdynamic all: all-am .SUFFIXES: @@ -264,12 +265,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libla.a: $(libla_a_OBJECTS) $(libla_a_DEPENDENCIES) - -rm -f libla.a - $(libla_a_AR) libla.a $(libla_a_OBJECTS) $(libla_a_LIBADD) - $(RANLIB) libla.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libla.la: $(libla_la_OBJECTS) $(libla_la_DEPENDENCIES) + $(libla_la_LINK) $(libla_la_OBJECTS) $(libla_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -277,9 +282,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/densemat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polynomial.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/densemat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polynomial.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -383,7 +388,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -411,7 +416,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -471,7 +476,7 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/meshing/Makefile.am b/libsrc/meshing/Makefile.am index 559ba3dd..8333d32f 100644 --- a/libsrc/meshing/Makefile.am +++ b/libsrc/meshing/Makefile.am @@ -10,12 +10,14 @@ curvedelems_new.hpp hpref_pyramid.hpp meshclass.hpp ruler2.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libmesh.a -libmesh_a_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ +noinst_LTLIBRARIES = libmesh.la +libmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ clusters.cpp curvedelems_new.cpp delaunay.cpp geomsearch.cpp global.cpp \ hprefinement.cpp improve2.cpp improve2gen.cpp improve3.cpp localh.cpp meshclass.cpp \ meshfunc.cpp meshfunc2d.cpp meshing2.cpp meshing3.cpp meshtool.cpp meshtype.cpp \ msghandler.cpp netrule2.cpp netrule3.cpp parser2.cpp parser3.cpp prism2rls.cpp \ - prism2rls_2.cpp pyramid2rls.cpp pyramidrls.cpp quadrls.cpp refine.cpp ruler2.cpp \ + pyramid2rls.cpp pyramidrls.cpp quadrls.cpp refine.cpp ruler2.cpp \ ruler3.cpp secondorder.cpp smoothing2.5.cpp smoothing2.cpp smoothing3.cpp \ specials.cpp tetrarls.cpp topology.cpp triarls.cpp validate.cpp zrefine.cpp + + diff --git a/libsrc/meshing/Makefile.in b/libsrc/meshing/Makefile.in index cd72df7e..d539841e 100644 --- a/libsrc/meshing/Makefile.in +++ b/libsrc/meshing/Makefile.in @@ -46,27 +46,19 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libmesh_a_AR = $(AR) $(ARFLAGS) -libmesh_a_LIBADD = -am_libmesh_a_OBJECTS = adfront2.$(OBJEXT) adfront3.$(OBJEXT) \ - bisect.$(OBJEXT) boundarylayer.$(OBJEXT) clusters.$(OBJEXT) \ - curvedelems_new.$(OBJEXT) delaunay.$(OBJEXT) \ - geomsearch.$(OBJEXT) global.$(OBJEXT) hprefinement.$(OBJEXT) \ - improve2.$(OBJEXT) improve2gen.$(OBJEXT) improve3.$(OBJEXT) \ - localh.$(OBJEXT) meshclass.$(OBJEXT) meshfunc.$(OBJEXT) \ - meshfunc2d.$(OBJEXT) meshing2.$(OBJEXT) meshing3.$(OBJEXT) \ - meshtool.$(OBJEXT) meshtype.$(OBJEXT) msghandler.$(OBJEXT) \ - netrule2.$(OBJEXT) netrule3.$(OBJEXT) parser2.$(OBJEXT) \ - parser3.$(OBJEXT) prism2rls.$(OBJEXT) prism2rls_2.$(OBJEXT) \ - pyramid2rls.$(OBJEXT) pyramidrls.$(OBJEXT) quadrls.$(OBJEXT) \ - refine.$(OBJEXT) ruler2.$(OBJEXT) ruler3.$(OBJEXT) \ - secondorder.$(OBJEXT) smoothing2.5.$(OBJEXT) \ - smoothing2.$(OBJEXT) smoothing3.$(OBJEXT) specials.$(OBJEXT) \ - tetrarls.$(OBJEXT) topology.$(OBJEXT) triarls.$(OBJEXT) \ - validate.$(OBJEXT) zrefine.$(OBJEXT) -libmesh_a_OBJECTS = $(am_libmesh_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libmesh_la_LIBADD = +am_libmesh_la_OBJECTS = adfront2.lo adfront3.lo bisect.lo \ + boundarylayer.lo clusters.lo curvedelems_new.lo delaunay.lo \ + geomsearch.lo global.lo hprefinement.lo improve2.lo \ + improve2gen.lo improve3.lo localh.lo meshclass.lo meshfunc.lo \ + meshfunc2d.lo meshing2.lo meshing3.lo meshtool.lo meshtype.lo \ + msghandler.lo netrule2.lo netrule3.lo parser2.lo parser3.lo \ + prism2rls.lo pyramid2rls.lo pyramidrls.lo quadrls.lo refine.lo \ + ruler2.lo ruler3.lo secondorder.lo smoothing2.5.lo \ + smoothing2.lo smoothing3.lo specials.lo tetrarls.lo \ + topology.lo triarls.lo validate.lo zrefine.lo +libmesh_la_OBJECTS = $(am_libmesh_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -79,8 +71,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libmesh_a_SOURCES) -DIST_SOURCES = $(libmesh_a_SOURCES) +SOURCES = $(libmesh_la_SOURCES) +DIST_SOURCES = $(libmesh_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -250,13 +242,13 @@ curvedelems_new.hpp hpref_pyramid.hpp meshclass.hpp ruler2.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libmesh.a -libmesh_a_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ +noinst_LTLIBRARIES = libmesh.la +libmesh_la_SOURCES = adfront2.cpp adfront3.cpp bisect.cpp boundarylayer.cpp \ clusters.cpp curvedelems_new.cpp delaunay.cpp geomsearch.cpp global.cpp \ hprefinement.cpp improve2.cpp improve2gen.cpp improve3.cpp localh.cpp meshclass.cpp \ meshfunc.cpp meshfunc2d.cpp meshing2.cpp meshing3.cpp meshtool.cpp meshtype.cpp \ msghandler.cpp netrule2.cpp netrule3.cpp parser2.cpp parser3.cpp prism2rls.cpp \ - prism2rls_2.cpp pyramid2rls.cpp pyramidrls.cpp quadrls.cpp refine.cpp ruler2.cpp \ + pyramid2rls.cpp pyramidrls.cpp quadrls.cpp refine.cpp ruler2.cpp \ ruler3.cpp secondorder.cpp smoothing2.5.cpp smoothing2.cpp smoothing3.cpp \ specials.cpp tetrarls.cpp topology.cpp triarls.cpp validate.cpp zrefine.cpp @@ -294,12 +286,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libmesh.a: $(libmesh_a_OBJECTS) $(libmesh_a_DEPENDENCIES) - -rm -f libmesh.a - $(libmesh_a_AR) libmesh.a $(libmesh_a_OBJECTS) $(libmesh_a_LIBADD) - $(RANLIB) libmesh.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libmesh.la: $(libmesh_la_OBJECTS) $(libmesh_la_DEPENDENCIES) + $(CXXLINK) $(libmesh_la_OBJECTS) $(libmesh_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -307,50 +303,49 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adfront2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adfront3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bisect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boundarylayer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clusters.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curvedelems_new.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delaunay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geomsearch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hprefinement.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/improve2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/improve2gen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/improve3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshclass.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshfunc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshfunc2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshing2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshing3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshtool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshtype.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msghandler.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netrule2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netrule3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prism2rls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prism2rls_2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pyramid2rls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pyramidrls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadrls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refine.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ruler2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ruler3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secondorder.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smoothing2.5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smoothing2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smoothing3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specials.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tetrarls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/topology.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triarls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zrefine.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adfront2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adfront3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bisect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boundarylayer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clusters.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curvedelems_new.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delaunay.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geomsearch.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hprefinement.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/improve2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/improve2gen.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/improve3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshclass.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshfunc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshfunc2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshing2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshing3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshtool.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshtype.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msghandler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netrule2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netrule3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prism2rls.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pyramid2rls.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pyramidrls.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadrls.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refine.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ruler2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ruler3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secondorder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smoothing2.5.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smoothing2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smoothing3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/specials.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tetrarls.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/topology.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/triarls.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/validate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zrefine.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -454,7 +449,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -482,7 +477,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -542,7 +537,7 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/occ/Makefile.am b/libsrc/occ/Makefile.am index 8aa96411..99cd5caa 100644 --- a/libsrc/occ/Makefile.am +++ b/libsrc/occ/Makefile.am @@ -13,8 +13,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(OCCFLAGS) METASOURCES = AUTO -noinst_LIBRARIES = libocc.a +noinst_LTLIBRARIES = libocc.la -libocc_a_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ +libocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \ occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp diff --git a/libsrc/occ/Makefile.in b/libsrc/occ/Makefile.in index 5e977ea6..04c4a688 100644 --- a/libsrc/occ/Makefile.in +++ b/libsrc/occ/Makefile.in @@ -46,16 +46,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libocc_a_AR = $(AR) $(ARFLAGS) -libocc_a_LIBADD = -am_libocc_a_OBJECTS = Partition_Inter2d.$(OBJEXT) \ - Partition_Inter3d.$(OBJEXT) Partition_Loop.$(OBJEXT) \ - Partition_Loop2d.$(OBJEXT) Partition_Loop3d.$(OBJEXT) \ - Partition_Spliter.$(OBJEXT) occconstruction.$(OBJEXT) \ - occgenmesh.$(OBJEXT) occgeom.$(OBJEXT) occmeshsurf.$(OBJEXT) -libocc_a_OBJECTS = $(am_libocc_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libocc_la_LIBADD = +am_libocc_la_OBJECTS = Partition_Inter2d.lo Partition_Inter3d.lo \ + Partition_Loop.lo Partition_Loop2d.lo Partition_Loop3d.lo \ + Partition_Spliter.lo occconstruction.lo occgenmesh.lo \ + occgeom.lo occmeshsurf.lo +libocc_la_OBJECTS = $(am_libocc_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -68,8 +65,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libocc_a_SOURCES) -DIST_SOURCES = $(libocc_a_SOURCES) +SOURCES = $(libocc_la_SOURCES) +DIST_SOURCES = $(libocc_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -240,8 +237,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(OCCFLAGS) # $(OCC_INC_FLAG) METASOURCES = AUTO -noinst_LIBRARIES = libocc.a -libocc_a_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ +noinst_LTLIBRARIES = libocc.la +libocc_la_SOURCES = Partition_Inter2d.cxx Partition_Inter3d.cxx \ Partition_Loop.cxx Partition_Loop2d.cxx Partition_Loop3d.cxx Partition_Spliter.cxx \ occconstruction.cpp occgenmesh.cpp occgeom.cpp occmeshsurf.cpp @@ -279,12 +276,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libocc.a: $(libocc_a_OBJECTS) $(libocc_a_DEPENDENCIES) - -rm -f libocc.a - $(libocc_a_AR) libocc.a $(libocc_a_OBJECTS) $(libocc_a_LIBADD) - $(RANLIB) libocc.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libocc.la: $(libocc_la_OBJECTS) $(libocc_la_DEPENDENCIES) + $(CXXLINK) $(libocc_la_OBJECTS) $(libocc_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -292,16 +293,16 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Inter2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Inter3d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Loop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Loop2d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Loop3d.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Spliter.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occconstruction.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occgenmesh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occgeom.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occmeshsurf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Inter2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Inter3d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Loop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Loop2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Loop3d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Partition_Spliter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occconstruction.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occgenmesh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occgeom.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/occmeshsurf.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -426,7 +427,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -454,7 +455,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -514,7 +515,7 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/opti/Makefile.am b/libsrc/opti/Makefile.am index 19ffbf59..a80f6e37 100644 --- a/libsrc/opti/Makefile.am +++ b/libsrc/opti/Makefile.am @@ -2,5 +2,5 @@ noinst_HEADERS = opti.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libopti.a -libopti_a_SOURCES = bfgs.cpp linopt.cpp linsearch.cpp +noinst_LTLIBRARIES = libopti.la +libopti_la_SOURCES = bfgs.cpp linopt.cpp linsearch.cpp diff --git a/libsrc/opti/Makefile.in b/libsrc/opti/Makefile.in index f9c8af3c..8aa52862 100644 --- a/libsrc/opti/Makefile.in +++ b/libsrc/opti/Makefile.in @@ -46,13 +46,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libopti_a_AR = $(AR) $(ARFLAGS) -libopti_a_LIBADD = -am_libopti_a_OBJECTS = bfgs.$(OBJEXT) linopt.$(OBJEXT) \ - linsearch.$(OBJEXT) -libopti_a_OBJECTS = $(am_libopti_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libopti_la_LIBADD = +am_libopti_la_OBJECTS = bfgs.lo linopt.lo linsearch.lo +libopti_la_OBJECTS = $(am_libopti_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -65,8 +62,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libopti_a_SOURCES) -DIST_SOURCES = $(libopti_a_SOURCES) +SOURCES = $(libopti_la_SOURCES) +DIST_SOURCES = $(libopti_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -228,8 +225,8 @@ top_srcdir = @top_srcdir@ noinst_HEADERS = opti.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libopti.a -libopti_a_SOURCES = bfgs.cpp linopt.cpp linsearch.cpp +noinst_LTLIBRARIES = libopti.la +libopti_la_SOURCES = bfgs.cpp linopt.cpp linsearch.cpp all: all-am .SUFFIXES: @@ -264,12 +261,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libopti.a: $(libopti_a_OBJECTS) $(libopti_a_DEPENDENCIES) - -rm -f libopti.a - $(libopti_a_AR) libopti.a $(libopti_a_OBJECTS) $(libopti_a_LIBADD) - $(RANLIB) libopti.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libopti.la: $(libopti_la_OBJECTS) $(libopti_la_DEPENDENCIES) + $(CXXLINK) $(libopti_la_OBJECTS) $(libopti_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -277,9 +278,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfgs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linopt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linsearch.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bfgs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linopt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linsearch.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -383,7 +384,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -411,7 +412,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -471,7 +472,7 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/stlgeom/Makefile.am b/libsrc/stlgeom/Makefile.am index 674ff1a7..b380120c 100644 --- a/libsrc/stlgeom/Makefile.am +++ b/libsrc/stlgeom/Makefile.am @@ -3,6 +3,6 @@ stltool.hpp stltopology.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libstl.a -libstl_a_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ +noinst_LTLIBRARIES = libstl.la +libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp diff --git a/libsrc/stlgeom/Makefile.in b/libsrc/stlgeom/Makefile.in index 7bf2a429..7fae31d1 100644 --- a/libsrc/stlgeom/Makefile.in +++ b/libsrc/stlgeom/Makefile.in @@ -46,14 +46,11 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libstl_a_AR = $(AR) $(ARFLAGS) -libstl_a_LIBADD = -am_libstl_a_OBJECTS = meshstlsurface.$(OBJEXT) stlgeom.$(OBJEXT) \ - stlgeomchart.$(OBJEXT) stlgeommesh.$(OBJEXT) stlline.$(OBJEXT) \ - stltool.$(OBJEXT) stltopology.$(OBJEXT) -libstl_a_OBJECTS = $(am_libstl_a_OBJECTS) +LTLIBRARIES = $(noinst_LTLIBRARIES) +libstl_la_LIBADD = +am_libstl_la_OBJECTS = meshstlsurface.lo stlgeom.lo stlgeomchart.lo \ + stlgeommesh.lo stlline.lo stltool.lo stltopology.lo +libstl_la_OBJECTS = $(am_libstl_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -66,8 +63,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libstl_a_SOURCES) -DIST_SOURCES = $(libstl_a_SOURCES) +SOURCES = $(libstl_la_SOURCES) +DIST_SOURCES = $(libstl_la_SOURCES) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -231,8 +228,8 @@ stltool.hpp stltopology.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO -noinst_LIBRARIES = libstl.a -libstl_a_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ +noinst_LTLIBRARIES = libstl.la +libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp all: all-am @@ -269,12 +266,16 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libstl.a: $(libstl_a_OBJECTS) $(libstl_a_DEPENDENCIES) - -rm -f libstl.a - $(libstl_a_AR) libstl.a $(libstl_a_OBJECTS) $(libstl_a_LIBADD) - $(RANLIB) libstl.a +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libstl.la: $(libstl_la_OBJECTS) $(libstl_la_DEPENDENCIES) + $(CXXLINK) $(libstl_la_OBJECTS) $(libstl_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -282,13 +283,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshstlsurface.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlgeom.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlgeomchart.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlgeommesh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlline.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stltool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stltopology.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshstlsurface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlgeom.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlgeomchart.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlgeommesh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlline.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stltool.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stltopology.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -392,7 +393,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: install: install-am install-exec: install-exec-am @@ -420,7 +421,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -480,7 +481,7 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff --git a/libsrc/visualization/Makefile.am b/libsrc/visualization/Makefile.am index 7fb7e349..f782cd16 100644 --- a/libsrc/visualization/Makefile.am +++ b/libsrc/visualization/Makefile.am @@ -7,5 +7,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) $(TCL_INC METASOURCES = AUTO noinst_LIBRARIES = libvisual.a libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp stlmeshing.cpp vscsg.cpp \ - vsfieldlines.cpp vsmesh.cpp vsocc.cpp vssolution.cpp + vsfieldlines.cpp vsmesh.cpp vsocc.cpp vssolution.cpp importsolution.cpp AM_CXXFLAGS = -DOPENGL diff --git a/libsrc/visualization/Makefile.in b/libsrc/visualization/Makefile.in index 4b3aacf0..2010628c 100644 --- a/libsrc/visualization/Makefile.in +++ b/libsrc/visualization/Makefile.in @@ -52,7 +52,8 @@ libvisual_a_AR = $(AR) $(ARFLAGS) libvisual_a_LIBADD = am_libvisual_a_OBJECTS = meshdoc.$(OBJEXT) mvdraw.$(OBJEXT) \ stlmeshing.$(OBJEXT) vscsg.$(OBJEXT) vsfieldlines.$(OBJEXT) \ - vsmesh.$(OBJEXT) vsocc.$(OBJEXT) vssolution.$(OBJEXT) + vsmesh.$(OBJEXT) vsocc.$(OBJEXT) vssolution.$(OBJEXT) \ + importsolution.$(OBJEXT) libvisual_a_OBJECTS = $(am_libvisual_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -242,7 +243,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) $(TCL_INC METASOURCES = AUTO noinst_LIBRARIES = libvisual.a libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp stlmeshing.cpp vscsg.cpp \ - vsfieldlines.cpp vsmesh.cpp vsocc.cpp vssolution.cpp + vsfieldlines.cpp vsmesh.cpp vsocc.cpp vssolution.cpp importsolution.cpp AM_CXXFLAGS = -DOPENGL all: all-am @@ -292,6 +293,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importsolution.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meshdoc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mvdraw.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stlmeshing.Po@am__quote@ diff --git a/libsrc/interface/importsolution.cpp b/libsrc/visualization/importsolution.cpp similarity index 98% rename from libsrc/interface/importsolution.cpp rename to libsrc/visualization/importsolution.cpp index 4f9d3e67..cf182d71 100644 --- a/libsrc/interface/importsolution.cpp +++ b/libsrc/visualization/importsolution.cpp @@ -11,11 +11,11 @@ #include #include -#include "nginterface.h" +#include namespace netgen { -#include "writeuser.hpp" + void ImportSolution (const char * filename) diff --git a/libsrc/visualization/vssolution.hpp b/libsrc/visualization/vssolution.hpp index 139aa496..3dc4c2bc 100644 --- a/libsrc/visualization/vssolution.hpp +++ b/libsrc/visualization/vssolution.hpp @@ -6,6 +6,9 @@ #ifndef SMALLLIB #ifndef NOTCL +extern +void ImportSolution (const char * filename); + extern int Ng_Vis_Set (ClientData clientData, Tcl_Interp * interp, int argc, tcl_const char *argv[]); diff --git a/ng/Makefile.am b/ng/Makefile.am index 0d2f5072..9cf31efd 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -3,15 +3,20 @@ noinst_HEADERS = demoview.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) bin_PROGRAMS = netgen -netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp +netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp nginterface.cpp -netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \ - $(top_builddir)/libsrc/geom2d/libgeom2d.a $(top_builddir)/libsrc/interface/libinterface.a \ - $(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/occ/libocc.a \ - $(top_builddir)/libsrc/visualization/libvisual.a $(top_builddir)/libsrc/meshing/libmesh.a \ - $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/opti/libopti.a \ - $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a \ +netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \ + $(top_builddir)/libsrc/csg/libcsg.la \ + $(top_builddir)/libsrc/geom2d/libgeom2d.la \ + $(top_builddir)/libsrc/interface/libinterface.la \ + $(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/opti/libopti.la \ + $(top_builddir)/libsrc/linalg/libla.la \ + $(top_builddir)/libsrc/general/libgeneral.la \ $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_SPEC) $(TCL_LIB_SPEC) diff --git a/ng/Makefile.in b/ng/Makefile.in index 28cb52c3..db64f586 100644 --- a/ng/Makefile.in +++ b/ng/Makefile.in @@ -52,20 +52,21 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_netgen_OBJECTS = demoview.$(OBJEXT) ngappinit.$(OBJEXT) \ - ngpkg.$(OBJEXT) onetcl.$(OBJEXT) + ngpkg.$(OBJEXT) onetcl.$(OBJEXT) nginterface.$(OBJEXT) netgen_OBJECTS = $(am_netgen_OBJECTS) am__DEPENDENCIES_1 = -netgen_DEPENDENCIES = $(top_builddir)/libsrc/csg/libcsg.a \ - $(top_builddir)/libsrc/geom2d/libgeom2d.a \ - $(top_builddir)/libsrc/interface/libinterface.a \ - $(top_builddir)/libsrc/stlgeom/libstl.a \ - $(top_builddir)/libsrc/occ/libocc.a \ +netgen_DEPENDENCIES = \ $(top_builddir)/libsrc/visualization/libvisual.a \ - $(top_builddir)/libsrc/meshing/libmesh.a \ - $(top_builddir)/libsrc/gprim/libgprim.a \ - $(top_builddir)/libsrc/opti/libopti.a \ - $(top_builddir)/libsrc/linalg/libla.a \ - $(top_builddir)/libsrc/general/libgeneral.a \ + $(top_builddir)/libsrc/csg/libcsg.la \ + $(top_builddir)/libsrc/geom2d/libgeom2d.la \ + $(top_builddir)/libsrc/interface/libinterface.la \ + $(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/opti/libopti.la \ + $(top_builddir)/libsrc/linalg/libla.la \ + $(top_builddir)/libsrc/general/libgeneral.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) netgen_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -247,13 +248,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_HEADERS = demoview.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) -netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp -netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \ - $(top_builddir)/libsrc/geom2d/libgeom2d.a $(top_builddir)/libsrc/interface/libinterface.a \ - $(top_builddir)/libsrc/stlgeom/libstl.a $(top_builddir)/libsrc/occ/libocc.a \ - $(top_builddir)/libsrc/visualization/libvisual.a $(top_builddir)/libsrc/meshing/libmesh.a \ - $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/opti/libopti.a \ - $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a \ +netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp nginterface.cpp +netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \ + $(top_builddir)/libsrc/csg/libcsg.la \ + $(top_builddir)/libsrc/geom2d/libgeom2d.la \ + $(top_builddir)/libsrc/interface/libinterface.la \ + $(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/opti/libopti.la \ + $(top_builddir)/libsrc/linalg/libla.la \ + $(top_builddir)/libsrc/general/libgeneral.la \ $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_SPEC) $(TCL_LIB_SPEC) dist_bin_SCRIPTS = dialog.tcl menustat.tcl ngicon.tcl ng.tcl \ @@ -353,6 +359,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demoview.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngappinit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nginterface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngpkg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onetcl.Po@am__quote@ diff --git a/libsrc/interface/nginterface.cpp b/ng/nginterface.cpp similarity index 100% rename from libsrc/interface/nginterface.cpp rename to ng/nginterface.cpp diff --git a/nglib/Makefile.am b/nglib/Makefile.am new file mode 100644 index 00000000..14d7178e --- /dev/null +++ b/nglib/Makefile.am @@ -0,0 +1,45 @@ +include_HEADERS = nglib.h + +AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(OCCFLAGS) + +lib_LTLIBRARIES = libnglib.la +libnglib_la_SOURCES = nglib.cpp + +libnglib_la_LIBADD = \ + $(top_builddir)/libsrc/interface/libinterface.la \ + $(top_builddir)/libsrc/occ/libocc.la \ + $(top_builddir)/libsrc/geom2d/libgeom2d.la \ + $(top_builddir)/libsrc/csg/libcsg.la \ + $(top_builddir)/libsrc/stlgeom/libstl.la \ + $(top_builddir)/libsrc/meshing/libmesh.la \ + $(top_builddir)/libsrc/gprim/libgprim.la \ + $(top_builddir)/libsrc/opti/libopti.la \ + $(top_builddir)/libsrc/linalg/libla.la \ + $(top_builddir)/libsrc/general/libgeneral.la + +libnglib_la_LDFLAGS = -avoid-version +# -rdynamic + + +bin_PROGRAMS = ng_vol +ng_vol_SOURCES = ng_vol.cpp +ng_vol_LDADD = \ + libnglib.la + + +# $(top_builddir)/libsrc/occ/libocc.la +# $(top_builddir)/libsrc/geom2d/libgeom2d.la +# $(top_builddir)/libsrc/csg/libcsg.la +# $(top_builddir)/libsrc/interface/libinterface.la \ +# $(top_builddir)/libsrc/stlgeom/libstl.la \ +# $(top_builddir)/libsrc/meshing/libmesh.la +# $(top_builddir)/libsrc/gprim/libgprim.la +# $(top_builddir)/libsrc/opti/libopti.la +# $(top_builddir)/libsrc/linalg/libla.la \ +# $(top_builddir)/libsrc/general/libgeneral.la + + +# ng_vol_LDFLAGS = -rdynamic + + + diff --git a/nglib/ng_vol.cpp b/nglib/ng_vol.cpp new file mode 100644 index 00000000..bc954b25 --- /dev/null +++ b/nglib/ng_vol.cpp @@ -0,0 +1,95 @@ +#include +#include + +using namespace std; + +namespace nglib { +#include +} + +int main (int argc, char ** argv) +{ + using namespace nglib; + + cout << "Netgen Testing" << endl; + + if (argc < 2) + { + cerr << "use: ng_vol filename" << endl; + return 1; + } + + + + Ng_Mesh * mesh; + + Ng_Init(); + + // creates mesh structure + mesh = Ng_NewMesh (); + + + + + + int i, np, nse, ne; + double point[3]; + int trig[3], tet[4]; + + + // reads surface mesh from file + ifstream in(argv[1]); + + in >> np; + cout << "Reading " << np << " points..."; cout.flush(); + for (i = 1; i <= np; i++) + { + in >> point[0] >> point[1] >> point[2]; + Ng_AddPoint (mesh, point); + } + cout << "done" << endl; + + in >> nse; + cout << "Reading " << nse << " faces..."; cout.flush(); + for (i = 1; i <= nse; i++) + { + in >> trig[0] >> trig[1] >> trig[2]; + Ng_AddSurfaceElement (mesh, NG_TRIG, trig); + } + cout << "done" << endl; + + + // generate volume mesh + Ng_Meshing_Parameters mp; + mp.maxh = 1e6; + mp.fineness = 1; + mp.secondorder = 0; + + cout << "start meshing" << endl; + Ng_GenerateVolumeMesh (mesh, &mp); + cout << "meshing done" << endl; + + // volume mesh output +// np = Ng_GetNP(mesh); +// cout << "Points: " << np << endl; + +// for (i = 1; i <= np; i++) +// { +// Ng_GetPoint (mesh, i, point); +// cout << i << ": " << point[0] << " " << point[1] << " " << point[2] << endl; +// } + +// ne = Ng_GetNE(mesh); +// cout << "Elements: " << ne << endl; +// for (i = 1; i <= ne; i++) +// { +// Ng_GetVolumeElement (mesh, i, tet); +// cout << i << ": " << tet[0] << " " << tet[1] +// << " " << tet[2] << " " << tet[3] << endl; +// } + + Ng_SaveMesh(mesh,"test.vol"); + + + return 0; +} diff --git a/nglib/nglib.cpp b/nglib/nglib.cpp new file mode 100644 index 00000000..764bcafb --- /dev/null +++ b/nglib/nglib.cpp @@ -0,0 +1,593 @@ +/**************************************************************************/ +/* File: nglib.cc */ +/* Author: Joachim Schoeberl */ +/* Date: 7. May. 2000 */ +/**************************************************************************/ + +/* + + Interface to the netgen meshing kernel + +*/ + + +#include +#include + +#include +#include +#include +#include +#include + + + +namespace netgen { + extern void MeshFromSpline2D (SplineGeometry2d & geometry, + Mesh *& mesh, + MeshingParameters & mp); +} + + + + +namespace nglib { +#include "nglib.h" +} + +using namespace netgen; + +// constants and types: + +namespace nglib +{ +// initialize, deconstruct Netgen library: +void Ng_Init () +{ + mycout = &cout; + myerr = &cerr; + testout = new ofstream ("test.out"); +} + +void Ng_Exit () +{ + ; +} + + + +Ng_Mesh * Ng_NewMesh () +{ + Mesh * mesh = new Mesh; + mesh->AddFaceDescriptor (FaceDescriptor (1, 1, 0, 1)); + return (Ng_Mesh*)(void*)mesh; +} + +void Ng_DeleteMesh (Ng_Mesh * mesh) +{ + delete (Mesh*)mesh; +} + + +// feeds points, surface elements and volume elements to the mesh +void Ng_AddPoint (Ng_Mesh * mesh, double * x) +{ + Mesh * m = (Mesh*)mesh; + m->AddPoint (Point3d (x[0], x[1], x[2])); +} + +void Ng_AddSurfaceElement (Ng_Mesh * mesh, Ng_Surface_Element_Type et, + int * pi) +{ + Mesh * m = (Mesh*)mesh; + Element2d el (3); + el.SetIndex (1); + el.PNum(1) = pi[0]; + el.PNum(2) = pi[1]; + el.PNum(3) = pi[2]; + m->AddSurfaceElement (el); +} + +void Ng_AddVolumeElement (Ng_Mesh * mesh, Ng_Volume_Element_Type et, + int * pi) +{ + Mesh * m = (Mesh*)mesh; + Element el (4); + el.SetIndex (1); + el.PNum(1) = pi[0]; + el.PNum(2) = pi[1]; + el.PNum(3) = pi[2]; + el.PNum(4) = pi[3]; + m->AddVolumeElement (el); +} + +// ask for number of points, surface and volume elements +int Ng_GetNP (Ng_Mesh * mesh) +{ + return ((Mesh*)mesh) -> GetNP(); +} + +int Ng_GetNSE (Ng_Mesh * mesh) +{ + return ((Mesh*)mesh) -> GetNSE(); +} + +int Ng_GetNE (Ng_Mesh * mesh) +{ + return ((Mesh*)mesh) -> GetNE(); +} + + +// return point coordinates +void Ng_GetPoint (Ng_Mesh * mesh, int num, double * x) +{ + const Point3d & p = ((Mesh*)mesh)->Point(num); + x[0] = p.X(); + x[1] = p.Y(); + x[2] = p.Z(); +} + +// return surface and volume element in pi +Ng_Surface_Element_Type +Ng_GetSurfaceElement (Ng_Mesh * mesh, int num, int * pi) +{ + const Element2d & el = ((Mesh*)mesh)->SurfaceElement(num); + for (int i = 1; i <= el.GetNP(); i++) + pi[i-1] = el.PNum(i); + Ng_Surface_Element_Type et; + switch (el.GetNP()) + { + case 3: et = NG_TRIG; break; + case 4: et = NG_QUAD; break; + case 6: et = NG_TRIG6; break; + } + return et; +} + +Ng_Volume_Element_Type +Ng_GetVolumeElement (Ng_Mesh * mesh, int num, int * pi) +{ + const Element & el = ((Mesh*)mesh)->VolumeElement(num); + for (int i = 1; i <= el.GetNP(); i++) + pi[i-1] = el.PNum(i); + Ng_Volume_Element_Type et; + switch (el.GetNP()) + { + case 4: et = NG_TET; break; + case 5: et = NG_PYRAMID; break; + case 6: et = NG_PRISM; break; + case 10: et = NG_TET10; break; + } + return et; +} + +void Ng_RestrictMeshSizeGlobal (Ng_Mesh * mesh, double h) +{ + ((Mesh*)mesh) -> SetGlobalH (h); +} + +void Ng_RestrictMeshSizePoint (Ng_Mesh * mesh, double * p, double h) +{ + ((Mesh*)mesh) -> RestrictLocalH (Point3d (p[0], p[1], p[2]), h); +} + +void Ng_RestrictMeshSizeBox (Ng_Mesh * mesh, double * pmin, double * pmax, double h) +{ + for (double x = pmin[0]; x < pmax[0]; x += h) + for (double y = pmin[1]; y < pmax[1]; y += h) + for (double z = pmin[2]; z < pmax[2]; z += h) + ((Mesh*)mesh) -> RestrictLocalH (Point3d (x, y, z), h); +} + + +// generates volume mesh from surface mesh +Ng_Result Ng_GenerateVolumeMesh (Ng_Mesh * mesh, Ng_Meshing_Parameters * mp) +{ + Mesh * m = (Mesh*)mesh; + + + MeshingParameters mparam; + mparam.maxh = mp->maxh; + mparam.meshsizefilename = mp->meshsize_filename; + + m->CalcLocalH(); + + MeshVolume (mparam, *m); + RemoveIllegalElements (*m); + OptimizeVolume (mparam, *m); + + return NG_OK; +} + + + +// 2D Meshing Functions: + + + +void Ng_AddPoint_2D (Ng_Mesh * mesh, double * x) +{ + Mesh * m = (Mesh*)mesh; + + m->AddPoint (Point3d (x[0], x[1], 0)); +} + +void Ng_AddBoundarySeg_2D (Ng_Mesh * mesh, int pi1, int pi2) +{ + Mesh * m = (Mesh*)mesh; + + Segment seg; + seg.p1 = pi1; + seg.p2 = pi2; + m->AddSegment (seg); +} + + +int Ng_GetNP_2D (Ng_Mesh * mesh) +{ + Mesh * m = (Mesh*)mesh; + return m->GetNP(); +} + +int Ng_GetNE_2D (Ng_Mesh * mesh) +{ + Mesh * m = (Mesh*)mesh; + return m->GetNSE(); +} + +int Ng_GetNSeg_2D (Ng_Mesh * mesh) +{ + Mesh * m = (Mesh*)mesh; + return m->GetNSeg(); +} + +void Ng_GetPoint_2D (Ng_Mesh * mesh, int num, double * x) +{ + Mesh * m = (Mesh*)mesh; + + Point<3> & p = m->Point(num); + x[0] = p(0); + x[1] = p(1); +} + +void Ng_GetElement_2D (Ng_Mesh * mesh, int num, int * pi, int * matnum) +{ + const Element2d & el = ((Mesh*)mesh)->SurfaceElement(num); + for (int i = 1; i <= 3; i++) + pi[i-1] = el.PNum(i); + if (matnum) + *matnum = el.GetIndex(); +} + + +void Ng_GetSegment_2D (Ng_Mesh * mesh, int num, int * pi, int * matnum) +{ + const Segment & seg = ((Mesh*)mesh)->LineSegment(num); + pi[0] = seg.p1; + pi[1] = seg.p2; + + if (matnum) + *matnum = seg.edgenr; +} + + + + +Ng_Geometry_2D * Ng_LoadGeometry_2D (const char * filename) +{ + SplineGeometry2d * geom = new SplineGeometry2d(); + geom -> Load (filename); + return (Ng_Geometry_2D *)geom; +} + +Ng_Result Ng_GenerateMesh_2D (Ng_Geometry_2D * geom, + Ng_Mesh ** mesh, + Ng_Meshing_Parameters * mp) +{ + // use global variable mparam + // MeshingParameters mparam; + mparam.maxh = mp->maxh; + mparam.meshsizefilename = mp->meshsize_filename; + mparam.quad = mp->quad_dominated; + + Mesh * m; + MeshFromSpline2D (*(SplineGeometry2d*)geom, m, mparam); + + cout << m->GetNSE() << " elements, " << m->GetNP() << " points" << endl; + + *mesh = (Ng_Mesh*)m; + return NG_OK; +} + +void Ng_HP_Refinement (Ng_Geometry_2D * geom, + Ng_Mesh * mesh, + int levels) +{ + Refinement2d ref(*(SplineGeometry2d*)geom); + HPRefinement (*(Mesh*)mesh, &ref, levels); +} + +void Ng_HP_Refinement (Ng_Geometry_2D * geom, + Ng_Mesh * mesh, + int levels, double parameter) +{ + Refinement2d ref(*(SplineGeometry2d*)geom); + HPRefinement (*(Mesh*)mesh, &ref, levels, parameter); +} + + + + + + + + + + + + + + + +ARRAY readtrias; //only before initstlgeometry +ARRAY > readedges; //only before init stlgeometry + +void Ng_SaveMesh(Ng_Mesh * mesh, const char* filename) +{ + ((Mesh*)mesh)->Save(filename); +} + +Ng_Mesh * Ng_LoadMesh(const char* filename) +{ + Mesh * mesh = new Mesh; + mesh->Load(filename); + return ( (Ng_Mesh*)mesh ); +} + +// loads geometry from STL file +Ng_STL_Geometry * Ng_STL_LoadGeometry (const char * filename, int binary) +{ + int i; + STLGeometry geom; + STLGeometry* geo; + ifstream ist(filename); + + if (binary) + { + geo = geom.LoadBinary(ist); + } + else + { + geo = geom.Load(ist); + } + + readtrias.SetSize(0); + readedges.SetSize(0); + + Point3d p; + Vec3d normal; + double p1[3]; + double p2[3]; + double p3[3]; + double n[3]; + + Ng_STL_Geometry * geo2 = Ng_STL_NewGeometry(); + + for (i = 1; i <= geo->GetNT(); i++) + { + const STLTriangle& t = geo->GetTriangle(i); + p = geo->GetPoint(t.PNum(1)); + p1[0] = p.X(); p1[1] = p.Y(); p1[2] = p.Z(); + p = geo->GetPoint(t.PNum(2)); + p2[0] = p.X(); p2[1] = p.Y(); p2[2] = p.Z(); + p = geo->GetPoint(t.PNum(3)); + p3[0] = p.X(); p3[1] = p.Y(); p3[2] = p.Z(); + normal = t.Normal(); + n[0] = normal.X(); n[1] = normal.Y(); n[2] = normal.Z(); + + Ng_STL_AddTriangle(geo2, p1, p2, p3, n); + } + + return geo2; +} + +// generate new STL Geometry +Ng_STL_Geometry * Ng_STL_NewGeometry () +{ + return (Ng_STL_Geometry*)(void*)new STLGeometry; +} + +// after adding triangles (and edges) initialize +Ng_Result Ng_STL_InitSTLGeometry (Ng_STL_Geometry * geom) +{ + STLGeometry* geo = (STLGeometry*)geom; + geo->InitSTLGeometry(readtrias); + readtrias.SetSize(0); + + if (readedges.Size() != 0) + { + int i; + /* + for (i = 1; i <= readedges.Size(); i+=2) + { + cout << "e(" << readedges.Get(i) << "," << readedges.Get(i+1) << ")" << endl; + } + */ + geo->AddEdges(readedges); + } + + if (geo->GetStatus() == STLTopology::STL_GOOD || geo->GetStatus() == STLTopology::STL_WARNING) return NG_OK; + return NG_SURFACE_INPUT_ERROR; +} + + // automatically generates edges: +Ng_Result Ng_STL_MakeEdges (Ng_STL_Geometry * geom, + Ng_Mesh* mesh, + Ng_Meshing_Parameters * mp) +{ + STLGeometry* stlgeometry = (STLGeometry*)geom; + Mesh* me = (Mesh*)mesh; + + MeshingParameters mparam; + + mparam.maxh = mp->maxh; + mparam.meshsizefilename = mp->meshsize_filename; + + me -> SetGlobalH (mparam.maxh); + me -> SetLocalH (stlgeometry->GetBoundingBox().PMin() - Vec3d(10, 10, 10), + stlgeometry->GetBoundingBox().PMax() + Vec3d(10, 10, 10), + 0.3); + + me -> LoadLocalMeshSize (mp->meshsize_filename); + /* + if (mp->meshsize_filename) + { + ifstream infile (mp->meshsize_filename); + if (!infile.good()) return NG_FILE_NOT_FOUND; + me -> LoadLocalMeshSize (infile); + } + */ + + STLMeshing (*stlgeometry, *me); + + stlgeometry->edgesfound = 1; + stlgeometry->surfacemeshed = 0; + stlgeometry->surfaceoptimized = 0; + stlgeometry->volumemeshed = 0; + + return NG_OK; +} + + +// generates mesh, empty mesh be already created. +Ng_Result Ng_STL_GenerateSurfaceMesh (Ng_STL_Geometry * geom, + Ng_Mesh* mesh, + Ng_Meshing_Parameters * mp) +{ + STLGeometry* stlgeometry = (STLGeometry*)geom; + Mesh* me = (Mesh*)mesh; + + MeshingParameters mparam; + + mparam.maxh = mp->maxh; + mparam.meshsizefilename = mp->meshsize_filename; + + /* + me -> SetGlobalH (mparam.maxh); + me -> SetLocalH (stlgeometry->GetBoundingBox().PMin() - Vec3d(10, 10, 10), + stlgeometry->GetBoundingBox().PMax() + Vec3d(10, 10, 10), + 0.3); + */ + /* + STLMeshing (*stlgeometry, *me); + + stlgeometry->edgesfound = 1; + stlgeometry->surfacemeshed = 0; + stlgeometry->surfaceoptimized = 0; + stlgeometry->volumemeshed = 0; + */ + int retval = STLSurfaceMeshing (*stlgeometry, *me); + if (retval == MESHING3_OK) + { + (*mycout) << "Success !!!!" << endl; + stlgeometry->surfacemeshed = 1; + stlgeometry->surfaceoptimized = 0; + stlgeometry->volumemeshed = 0; + } + else if (retval == MESHING3_OUTERSTEPSEXCEEDED) + { + (*mycout) << "ERROR: Give up because of too many trials. Meshing aborted!" << endl; + } + else if (retval == MESHING3_TERMINATE) + { + (*mycout) << "Meshing Stopped!" << endl; + } + else + { + (*mycout) << "ERROR: Surface meshing not successful. Meshing aborted!" << endl; + } + + + STLSurfaceOptimization (*stlgeometry, *me, mparam); + + return NG_OK; +} + + + // fills STL Geometry + // positive orientation + // normal vector may be null-pointer +void Ng_STL_AddTriangle (Ng_STL_Geometry * geom, + double * p1, double * p2, double * p3, double * nv) +{ + Point<3> apts[3]; + apts[0] = Point<3>(p1[0],p1[1],p1[2]); + apts[1] = Point<3>(p2[0],p2[1],p2[2]); + apts[2] = Point<3>(p3[0],p3[1],p3[2]); + + Vec<3> n; + if (!nv) + n = Cross (apts[0]-apts[1], apts[0]-apts[2]); + else + n = Vec<3>(nv[0],nv[1],nv[2]); + + readtrias.Append(STLReadTriangle(apts,n)); +} + + // add (optional) edges: +void Ng_STL_AddEdge (Ng_STL_Geometry * geom, + double * p1, double * p2) +{ + readedges.Append(Point3d(p1[0],p1[1],p1[2])); + readedges.Append(Point3d(p2[0],p2[1],p2[2])); +} + + + +Ng_Meshing_Parameters :: Ng_Meshing_Parameters() +{ + maxh = 1000; + fineness = 0.5; + secondorder = 0; + meshsize_filename = 0; + quad_dominated = 0; +} + + +} + + +// compatibility functions: + +namespace netgen +{ + + char geomfilename[255]; + +void MyError (const char * ch) +{ + cerr << ch; +} + +//Destination for messages, errors, ... +void Ng_PrintDest(const char * s) +{ + (*mycout) << s << flush; +} + +double GetTime () +{ + return 0; +} + +void ResetTime () +{ + ; +} + +void MyBeep (int i) +{ + ; +} + +} diff --git a/nglib/nglib.h b/nglib/nglib.h new file mode 100644 index 00000000..8c6285f6 --- /dev/null +++ b/nglib/nglib.h @@ -0,0 +1,221 @@ +#ifndef NGLIB +#define NGLIB + +/**************************************************************************/ +/* File: nglib.hh */ +/* Author: Joachim Schoeberl */ +/* Date: 7. May. 2000 */ +/**************************************************************************/ + +/* + +Interface to the netgen meshing kernel + +*/ + +/// Data type for NETGEN mesh +typedef void * Ng_Mesh; + +/// Data type for NETGEN CSG geomty +typedef void * Ng_CSG_Geometry; + +/// Data type for NETGEN 2D geomty +typedef void * Ng_Geometry_2D; + +/// Data type for NETGEN STL geomty +typedef void * Ng_STL_Geometry; + + + +// max number of nodes per element +#define NG_VOLUME_ELEMENT_MAXPOINTS 10 + +// implemented element types: +enum Ng_Volume_Element_Type { NG_TET = 1, NG_PYRAMID = 2, NG_PRISM = 3, + NG_TET10 = 4 }; + +// max number of nodes per surface element +#define NG_SURFACE_ELEMENT_MAXPOINTS 6 + +// implemented element types: +enum Ng_Surface_Element_Type { NG_TRIG = 1, NG_QUAD = 2, + NG_TRIG6 = 3 }; + + + +class Ng_Meshing_Parameters +{ + public: + + double maxh; + double fineness; // 0 .. coarse, 1 .. fine + int secondorder; + char * meshsize_filename; + int quad_dominated; + + Ng_Meshing_Parameters(); +}; + + +enum Ng_Result { NG_OK = 0, + NG_SURFACE_INPUT_ERROR = 1, + NG_VOLUME_FAILURE = 2, + NG_STL_INPUT_ERROR = 3, + NG_SURFACE_FAILURE = 4, + NG_FILE_NOT_FOUND = 5 }; + + + + + +// initialize, deconstruct Netgen library: +void Ng_Init (); +void Ng_Exit (); + + + +// Generates new mesh structure +Ng_Mesh * Ng_NewMesh (); +void Ng_DeleteMesh (Ng_Mesh * mesh); + +// feeds points, surface elements and volume elements to the mesh +void Ng_AddPoint (Ng_Mesh * mesh, double * x); +void Ng_AddSurfaceElement (Ng_Mesh * mesh, Ng_Surface_Element_Type et, + int * pi); +void Ng_AddVolumeElement (Ng_Mesh * mesh, Ng_Volume_Element_Type et, + int * pi); + +// ask for number of points, surface and volume elements +int Ng_GetNP (Ng_Mesh * mesh); +int Ng_GetNSE (Ng_Mesh * mesh); +int Ng_GetNE (Ng_Mesh * mesh); + + +// return point coordinates +void Ng_GetPoint (Ng_Mesh * mesh, int num, double * x); + +// return surface and volume element in pi +Ng_Surface_Element_Type +Ng_GetSurfaceElement (Ng_Mesh * mesh, int num, int * pi); + +Ng_Volume_Element_Type +Ng_GetVolumeElement (Ng_Mesh * mesh, int num, int * pi); + + +// Defines MeshSize Functions +void Ng_RestrictMeshSizeGlobal (Ng_Mesh * mesh, double h); +void Ng_RestrictMeshSizePoint (Ng_Mesh * mesh, double * p, double h); +void Ng_RestrictMeshSizeBox (Ng_Mesh * mesh, double * pmin, double * pmax, double h); + +// generates volume mesh from surface mesh +Ng_Result Ng_GenerateVolumeMesh (Ng_Mesh * mesh, Ng_Meshing_Parameters * mp); + +void Ng_SaveMesh(Ng_Mesh * mesh, const char* filename); +Ng_Mesh * Ng_LoadMesh(const char* filename); + + + + + +// ********************************************************** +// ** 2D Meshing ** +// ********************************************************** + + +// feeds points and boundary to mesh + +void Ng_AddPoint_2D (Ng_Mesh * mesh, double * x); +void Ng_AddBoundarySeg_2D (Ng_Mesh * mesh, int pi1, int pi2); + +// ask for number of points, elements and boundary segments +int Ng_GetNP_2D (Ng_Mesh * mesh); +int Ng_GetNE_2D (Ng_Mesh * mesh); +int Ng_GetNSeg_2D (Ng_Mesh * mesh); + +// return point coordinates +void Ng_GetPoint_2D (Ng_Mesh * mesh, int num, double * x); + +// return 2d triangles +void Ng_GetElement_2D (Ng_Mesh * mesh, int num, int * pi, int * matnum = NULL); + +// return 2d boundary segment +void Ng_GetSegment_2D (Ng_Mesh * mesh, int num, int * pi, int * matnum = NULL); + + +// load 2d netgen spline geometry +Ng_Geometry_2D * Ng_LoadGeometry_2D (const char * filename); + +// generate 2d mesh, mesh is allocated by function +Ng_Result Ng_GenerateMesh_2D (Ng_Geometry_2D * geom, + Ng_Mesh ** mesh, + Ng_Meshing_Parameters * mp); + +void Ng_HP_Refinement (Ng_Geometry_2D * geom, + Ng_Mesh * mesh, + int levels); + + + + + +// ********************************************************** +// ** STL Meshing ** +// ********************************************************** + + +// loads geometry from STL file +Ng_STL_Geometry * Ng_STL_LoadGeometry (const char * filename, int binary = 0); + + +// generate new STL Geometry +Ng_STL_Geometry * Ng_STL_NewGeometry (); + + +// fills STL Geometry +// positive orientation +// normal vector may be null-pointer +void Ng_STL_AddTriangle (Ng_STL_Geometry * geom, + double * p1, double * p2, double * p3, + double * nv = NULL); + +// add (optional) edges : +void Ng_STL_AddEdge (Ng_STL_Geometry * geom, + double * p1, double * p2); + +// after adding triangles (and edges) initialize +Ng_Result Ng_STL_InitSTLGeometry (Ng_STL_Geometry * geom); + +// automatically generates edges: +Ng_Result Ng_STL_MakeEdges (Ng_STL_Geometry * geom, + Ng_Mesh* mesh, + Ng_Meshing_Parameters * mp); + + +// generates mesh, empty mesh must be already created. +Ng_Result Ng_STL_GenerateSurfaceMesh (Ng_STL_Geometry * geom, + Ng_Mesh * mesh, + Ng_Meshing_Parameters * mp); + + +#ifdef ACIS + +// ********************************************************** +// ** ACIS Meshing ** +// ********************************************************** + +/// Data type for NETGEN STL geomty +typedef void * Ng_ACIS_Geometry; + +// loads geometry from STL file +Ng_ACIS_Geometry * Ng_ACIS_LoadGeometry (const char * filename); + +// generates mesh, empty mesh must be already created. +Ng_Result Ng_ACIS_GenerateSurfaceMesh (Ng_ACIS_Geometry * geom, + Ng_Mesh * mesh, + Ng_Meshing_Parameters * mp); + + +#endif + + +#endif \ No newline at end of file