[MOAB-dev] commit/MOAB: danwu: Fix merge conflicts in examples/makefile

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/c887603504a2/
Changeset:   c887603504a2
Branch:      error_handling_enhancement
User:        danwu
Date:        2014-02-12 17:42:11
Summary:     Fix merge conflicts in examples/makefile

Affected #:  1 file

diff --git a/examples/makefile b/examples/makefile
index e52043b..c2a0c38 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -53,7 +53,7 @@ point_in_elem_search: point_in_elem_search.o ${MOAB_LIBDIR}/libMOAB.la
 	${MOAB_CXX} -o $@ $< ${MOAB_LIBS_LINK}
 
 PushParMeshIntoMoabF90: PushParMeshIntoMoabF90.o
-	${MOAB_CXX} -o $@ $< ${IMESH_LIBS} -lgfortran -L/usr/lib/openmpi/lib -lmpi_f90 -lmpi_f77 -lmpi -lopen-rte -lopen-pal -ldl
+	${MOAB_FC} -o $@ $< ${IMESH_LIBS}
 
 DeformMeshRemap: DeformMeshRemap.o ${MOAB_LIBDIR}/libMOAB.la
 	${MOAB_CXX} -o $@ $< ${MOAB_LIBS_LINK} -lmbcoupler ${MOAB_LIBS_LINK}

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.