From d462a1e95ace36a8b17dd9c604448eebe83a791e Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Sat, 17 Jan 2009 19:37:57 +0000 Subject: [PATCH] fixes for ngsolve interface --- Makefile.am | 8 +++- Makefile.in | 3 +- configure | 43 +++++++++++---------- configure.ac | 2 + libsrc/general/Makefile.am | 4 +- libsrc/general/Makefile.in | 54 ++++++++++++++++++++------ libsrc/interface/Makefile.am | 2 +- libsrc/interface/Makefile.in | 2 +- libsrc/interface/nginterface.cpp | 11 +++++- libsrc/interface/nginterface.h | 10 +++-- libsrc/visualization/Makefile.am | 4 +- libsrc/visualization/Makefile.in | 54 ++++++++++++++++++++------ ng/Makefile.am | 11 +++++- ng/Makefile.in | 66 +++++++++++++++++++++++--------- ng/ngappinit.cpp | 3 +- 15 files changed, 202 insertions(+), 75 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9a469626..0af4152d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,9 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libsrc ng tutorials +METASOURCES = AUTO + +SUBDIRS = libsrc ng tutorials + + + + diff --git a/Makefile.in b/Makefile.in index e9a6e597..9608265a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -229,7 +229,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libsrc ng tutorials +METASOURCES = AUTO +SUBDIRS = libsrc ng tutorials all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/configure b/configure index fbd064b1..1735ffb4 100755 --- a/configure +++ b/configure @@ -747,6 +747,7 @@ PACKAGE_VERSION='4.9.3' PACKAGE_STRING='netgen 4.9.3' PACKAGE_BUGREPORT='' +ac_default_prefix="/opt/netgen" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -2574,6 +2575,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + # TEA extensions pass this us the version of TEA they think they # are compatible with. TEA_VERSION="3.6" @@ -5546,13 +5549,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:5549: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5552: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5552: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5555: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5555: output\"" >&5) + (eval echo "\"\$as_me:5558: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6758,7 +6761,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6761 "configure"' > conftest.$ac_ext + echo '#line 6764 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9334,11 +9337,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:9337: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9340: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9341: \$? = $ac_status" >&5 + echo "$as_me:9344: \$? = $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. @@ -9673,11 +9676,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:9676: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9679: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9680: \$? = $ac_status" >&5 + echo "$as_me:9683: \$? = $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. @@ -9778,11 +9781,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:9781: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9784: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9785: \$? = $ac_status" >&5 + echo "$as_me:9788: \$? = $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 @@ -9833,11 +9836,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:9836: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9839: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9840: \$? = $ac_status" >&5 + echo "$as_me:9843: \$? = $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 @@ -12633,7 +12636,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12636 "configure" +#line 12639 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12729,7 +12732,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12732 "configure" +#line 12735 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14749,11 +14752,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:14752: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14755: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14756: \$? = $ac_status" >&5 + echo "$as_me:14759: \$? = $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. @@ -14848,11 +14851,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:14851: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14854: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14855: \$? = $ac_status" >&5 + echo "$as_me:14858: \$? = $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 @@ -14900,11 +14903,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:14903: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14906: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14907: \$? = $ac_status" >&5 + echo "$as_me:14910: \$? = $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 diff --git a/configure.ac b/configure.ac index f9090312..95a52664 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,8 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_CONFIG_MACRO_DIR([m4]) +AC_PREFIX_DEFAULT(["/opt/netgen"]) + TEA_INIT([3.6]) diff --git a/libsrc/general/Makefile.am b/libsrc/general/Makefile.am index d2f72fe6..dcb13353 100644 --- a/libsrc/general/Makefile.am +++ b/libsrc/general/Makefile.am @@ -1,4 +1,6 @@ -noinst_HEADERS = array.hpp dynamicmem.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp parthreads.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp moveablemem.hpp ngexception.hpp seti.hpp symbolta.hpp +noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp seti.hpp symbolta.hpp + +include_HEADERS = dynamicmem.hpp moveablemem.hpp parthreads.hpp ngexception.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO diff --git a/libsrc/general/Makefile.in b/libsrc/general/Makefile.in index 3a7a7390..954bc778 100644 --- a/libsrc/general/Makefile.in +++ b/libsrc/general/Makefile.in @@ -34,8 +34,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = libsrc/general -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 \ @@ -71,7 +71,15 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libgeneral_a_SOURCES) DIST_SOURCES = $(libgeneral_a_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) @@ -229,7 +237,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_HEADERS = array.hpp dynamicmem.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp parthreads.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp moveablemem.hpp ngexception.hpp seti.hpp symbolta.hpp +noinst_HEADERS = array.hpp myadt.hpp optmem.hpp sort.hpp table.hpp autodiff.hpp flags.hpp mystring.hpp spbita2d.hpp template.hpp autoptr.hpp hashtabl.hpp netgenout.hpp profiler.hpp stack.hpp bitarray.hpp seti.hpp symbolta.hpp +include_HEADERS = dynamicmem.hpp moveablemem.hpp parthreads.hpp ngexception.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include METASOURCES = AUTO noinst_LIBRARIES = libgeneral.a @@ -327,6 +336,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)'; \ @@ -405,6 +431,9 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(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 @@ -450,7 +479,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-includeHEADERS install-dvi: install-dvi-am @@ -486,7 +515,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-includeHEADERS .MAKE: install-am install-strip @@ -496,12 +525,13 @@ uninstall-am: 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-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am + 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 # 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/Makefile.am b/libsrc/interface/Makefile.am index 01ed8de5..19ea2043 100644 --- a/libsrc/interface/Makefile.am +++ b/libsrc/interface/Makefile.am @@ -1,7 +1,7 @@ include_HEADERS = nginterface.h noinst_HEADERS = writeuser.hpp -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(TCL_INCLUDES) +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 \ diff --git a/libsrc/interface/Makefile.in b/libsrc/interface/Makefile.in index 44201986..1ea8aa4b 100644 --- a/libsrc/interface/Makefile.in +++ b/libsrc/interface/Makefile.in @@ -243,7 +243,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ include_HEADERS = nginterface.h noinst_HEADERS = writeuser.hpp -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(TCL_INCLUDES) +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 \ diff --git a/libsrc/interface/nginterface.cpp b/libsrc/interface/nginterface.cpp index 024c5030..991b9515 100644 --- a/libsrc/interface/nginterface.cpp +++ b/libsrc/interface/nginterface.cpp @@ -1868,7 +1868,7 @@ void Ng_SetSolutionData (Ng_SolutionData * soldata) // vssolution.ClearSolutionData (); VisualSceneSolution::SolData * vss = new VisualSceneSolution::SolData; - // cout << "Add solution " << soldata->name << ", type = " << soldata->soltype << endl; + cout << "Add solution " << soldata->name << ", type = " << soldata->soltype << endl; vss->name = new char[strlen (soldata->name)+1]; strcpy (vss->name, soldata->name); @@ -2104,6 +2104,15 @@ int Ng_ShouldTerminate(void) return multithread.terminate; } +void Ng_SetRunning(int flag) +{ + multithread.running = flag; +} +int Ng_IsRunning() +{ + return multithread.running; +} + ///// Added by Roman Stainko .... int Ng_GetVertex_Elements( int vnr, int* elems ) { diff --git a/libsrc/interface/nginterface.h b/libsrc/interface/nginterface.h index b0c4c2ba..62ad6988 100644 --- a/libsrc/interface/nginterface.h +++ b/libsrc/interface/nginterface.h @@ -282,9 +282,10 @@ extern "C" { #endif -namespace netgen { -#include "../visualization/soldata.hpp" -} + namespace netgen { + // #include "../visualization/soldata.hpp" + class SolutionData; + } enum Ng_SolutionType { NG_SOLUTION_NODAL = 1, @@ -343,7 +344,8 @@ namespace netgen { void Ng_SetTerminate(void); void Ng_UnSetTerminate(void); int Ng_ShouldTerminate(void); - + void Ng_SetRunning(int flag); + int Ng_IsRunning(); //// added by Roman Stainko .... int Ng_GetVertex_Elements( int vnr, int* elems); diff --git a/libsrc/visualization/Makefile.am b/libsrc/visualization/Makefile.am index bbb9fb7e..7fb7e349 100644 --- a/libsrc/visualization/Makefile.am +++ b/libsrc/visualization/Makefile.am @@ -1,6 +1,8 @@ -noinst_HEADERS = meshdoc.hpp mvdraw.hpp soldata.hpp vispar.hpp \ +noinst_HEADERS = meshdoc.hpp mvdraw.hpp vispar.hpp \ visual.hpp vssolution.hpp +include_HEADERS = soldata.hpp + AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) METASOURCES = AUTO noinst_LIBRARIES = libvisual.a diff --git a/libsrc/visualization/Makefile.in b/libsrc/visualization/Makefile.in index b64e8f70..4b3aacf0 100644 --- a/libsrc/visualization/Makefile.in +++ b/libsrc/visualization/Makefile.in @@ -34,8 +34,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = libsrc/visualization -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 \ @@ -68,7 +68,15 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libvisual_a_SOURCES) DIST_SOURCES = $(libvisual_a_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) @@ -226,9 +234,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_HEADERS = meshdoc.hpp mvdraw.hpp soldata.hpp vispar.hpp \ +noinst_HEADERS = meshdoc.hpp mvdraw.hpp vispar.hpp \ visual.hpp vssolution.hpp +include_HEADERS = soldata.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) METASOURCES = AUTO noinst_LIBRARIES = libvisual.a @@ -318,6 +327,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)'; \ @@ -396,6 +422,9 @@ check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) $(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 @@ -441,7 +470,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-includeHEADERS install-dvi: install-dvi-am @@ -477,7 +506,7 @@ ps: ps-am ps-am: -uninstall-am: +uninstall-am: uninstall-includeHEADERS .MAKE: install-am install-strip @@ -487,12 +516,13 @@ uninstall-am: 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-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am + 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 # 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/ng/Makefile.am b/ng/Makefile.am index 1839eabd..0d2f5072 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -2,7 +2,6 @@ noinst_HEADERS = demoview.hpp AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) -METASOURCES = AUTO bin_PROGRAMS = netgen netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp @@ -14,3 +13,13 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.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 \ $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_SPEC) $(TCL_LIB_SPEC) + + + + +dist_bin_SCRIPTS = dialog.tcl menustat.tcl ngicon.tcl ng.tcl \ +ngvisual.tcl sockets.tcl drawing.tcl nghelp.tcl ngshell.tcl \ +ngtesting.tcl parameters.tcl variables.tcl + + +netgen_LDFLAGS = -rdynamic diff --git a/ng/Makefile.in b/ng/Makefile.in index 4f807985..28cb52c3 100644 --- a/ng/Makefile.in +++ b/ng/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +36,8 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = netgen$(EXEEXT) subdir = ng -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(dist_bin_SCRIPTS) $(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 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_netgen_OBJECTS = demoview.$(OBJEXT) ngappinit.$(OBJEXT) \ @@ -67,6 +68,11 @@ netgen_DEPENDENCIES = $(top_builddir)/libsrc/csg/libcsg.a \ $(top_builddir)/libsrc/general/libgeneral.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +netgen_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(netgen_LDFLAGS) $(LDFLAGS) -o $@ +dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(dist_bin_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -241,7 +247,6 @@ 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) -METASOURCES = AUTO 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 \ @@ -251,6 +256,11 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \ $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a \ $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_SPEC) $(TCL_LIB_SPEC) +dist_bin_SCRIPTS = dialog.tcl menustat.tcl ngicon.tcl ng.tcl \ +ngvisual.tcl sockets.tcl drawing.tcl nghelp.tcl ngshell.tcl \ +ngtesting.tcl parameters.tcl variables.tcl + +netgen_LDFLAGS = -rdynamic all: all-am .SUFFIXES: @@ -314,7 +324,26 @@ clean-binPROGRAMS: done netgen$(EXEEXT): $(netgen_OBJECTS) $(netgen_DEPENDENCIES) @rm -f netgen$(EXEEXT) - $(CXXLINK) $(netgen_OBJECTS) $(netgen_LDADD) $(LIBS) + $(netgen_LINK) $(netgen_OBJECTS) $(netgen_LDADD) $(LIBS) +install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(dist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(dist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-dist_binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -429,9 +458,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(HEADERS) +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -482,7 +511,7 @@ install-data-am: install-dvi: install-dvi-am -install-exec-am: install-binPROGRAMS +install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS install-html: install-html-am @@ -514,7 +543,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS .MAKE: install-am install-strip @@ -522,15 +551,16 @@ uninstall-am: uninstall-binPROGRAMS clean-generic clean-libtool ctags distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS 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-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS + install-binPROGRAMS install-data install-data-am \ + install-dist_binSCRIPTS 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-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-dist_binSCRIPTS # 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/ng/ngappinit.cpp b/ng/ngappinit.cpp index e908a8c5..164fc980 100644 --- a/ng/ngappinit.cpp +++ b/ng/ngappinit.cpp @@ -214,7 +214,7 @@ int main(int argc, char ** argv) // parse tcl-script int errcode; - bool internaltcl = true; + bool internaltcl = false; if (shellmode) internaltcl = false; @@ -232,6 +232,7 @@ int main(int argc, char ** argv) internaltcl=true; if (parameters.GetDefineFlag ("externaltcl")) internaltcl=false; + if (internaltcl)