[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/a6e136fb7e04/
Changeset:   a6e136fb7e04
Branch:      error_handling_enhancement
User:        danwu
Date:        2014-02-26 22:17:41
Summary:     Fix merge conflicts in examples/makefile

Affected #:  1 file

diff --git a/examples/makefile b/examples/makefile
index 46d894b..9cb50bf 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -70,7 +70,7 @@ TestErrorHandlingPar: TestErrorHandlingPar.o ${MOAB_LIBDIR}/libMOAB.la
 	${MOAB_CXX} -o $@ $< ${MOAB_LIBS_LINK}
 
 clean:
-	rm -rf *.o *.mod ${EXAMPLES} ${PAREXAMPLES} ${EXOIIEXAMPLES} ${ERROREXAMPLES} ${F90EXAMPLES}
+	rm -rf *.o *.mod *.h5m ${EXAMPLES} ${PAREXAMPLES} ${EXOIIEXAMPLES} ${F90EXAMPLES}
 
 .cpp.o :
 	${MOAB_CXX} ${CXXFLAGS} ${MOAB_CXXFLAGS} ${MOAB_CPPFLAGS} ${MOAB_INCLUDES} -DMESH_DIR=\"${MESH_DIR}\" -c $<

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.