[MOAB-dev] commit/MOAB: iulian07: fix the shared parallel builds.

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/ade16e36fdcf/
Changeset:   ade16e36fdcf
Branch:      master
User:        iulian07
Date:        2013-09-07 21:27:14
Summary:     fix the shared parallel builds.
Explicit dependencies need to be added, specially for ubuntu 12's gold
linker.

We do not really use these builds, except for some fast parallel tests on
desktops/laptops
On the big machines we use static builds, most of the time.

Affected #:  2 files

diff --git a/test/parallel/Makefile.am b/test/parallel/Makefile.am
index e1098c5..130bfe8 100644
--- a/test/parallel/Makefile.am
+++ b/test/parallel/Makefile.am
@@ -76,6 +76,7 @@ check_PROGRAMS = $(TESTS) mbparallelcomm_test partcheck structured3 parmerge
 pcomm_unit_SOURCES = pcomm_unit.cpp
 parallel_hdf5_test_SOURCES = parallel_hdf5_test.cc
 mhdf_parallel_SOURCES = mhdf_parallel.c
+mhdf_parallel_LDADD = $(LDADD) $(HDF5_LIBS)
 parallel_unit_tests_SOURCES = parallel_unit_tests.cpp
 parallel_write_test_SOURCES = parallel_write_test.cc
 uber_parallel_test_SOURCES = uber_parallel_test.cpp
@@ -92,7 +93,8 @@ mpastrvpart_SOURCES = mpastrvpart.cpp
 
 if ENABLE_mbcoupler
   par_coupler_test_SOURCES = par_coupler_test.cpp
-  par_coupler_test_LDADD = $(LDADD) ../../tools/mbcoupler/libmbcoupler.la
+  par_coupler_test_LDADD = $(LDADD) $(top_builddir)/tools/mbcoupler/libmbcoupler.la \
+          $(top_builddir)/itaps/imesh/libiMesh.la
 endif
 
 if ENABLE_mbcslam

diff --git a/tools/mbcslam/Makefile.am b/tools/mbcslam/Makefile.am
index 68a1812..ed41f8e 100644
--- a/tools/mbcslam/Makefile.am
+++ b/tools/mbcslam/Makefile.am
@@ -21,7 +21,7 @@ lib_LTLIBRARIES = libmbcslam.la
 libmbcslam_la_LIBADD = $(top_builddir)/src/libMOAB.la $(top_builddir)/itaps/imesh/libiMesh.la \
          $(top_builddir)/tools/mbcoupler/libmbcoupler.la
          
-LDADD = libmbcslam.la $(top_builddir)/tools/mbcoupler/libmbcoupler.la
+LDADD = $(top_builddir)/src/libMOAB.la libmbcslam.la $(top_builddir)/tools/mbcoupler/libmbcoupler.la
 
 libmbcslam_la_SOURCES = \
    Intx2Mesh.cpp Intx2Mesh.hpp Intx2MeshOnSphere.cpp Intx2MeshOnSphere.hpp \
@@ -43,6 +43,7 @@ TESTS = intx_on_sphere_test  intx_in_plane_test  spec_visu_test spherical_area_t
 noinst_PROGRAMS =  cslam_par_test
 if NETCDF_FILE
   noinst_PROGRAMS += process_arm
+  process_arm_LDADD = $(LDADD) $(NETCDF_LIBS)
 endif
 
 check_PROGRAMS = $(TESTS) 
@@ -55,7 +56,7 @@ intx_mpas_SOURCES = intx_mpas.cpp
 process_arm_SOURCES = process_arm.cpp
 
 cslam_par_test_SOURCES = cslam_par_test.cpp
-cslam_par_test_LDADD = $(LDADD) $(top_builddir)/tools/mbcoupler/libmbcoupler.la 
+
 EXTRA_DIST  = lagrangeHomme.vtk  \
               eulerHomme.vtk \
               m1.vtk \

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.