Merge from V6_main 11/02/2013

[modules/med.git] / src / MEDPartitioner / Test / Makefile.am

diff --git a/src/MEDPartitioner/Test/Makefile.am b/src/MEDPartitioner/Test/Makefile.am
index 19dcc228349d2f92c4625d0351d3b12a34a040c8..b2a9420af7b06f82e9586f4f6d48efc6dbc097ed 100644 (file)
--- a/src/MEDPartitioner/Test/Makefile.am
+++ b/src/MEDPartitioner/Test/Makefile.am
@@ -49,7 +49,7 @@ libMEDPARTITIONERTest_la_LDFLAGS=
 if MED_ENABLE_PARMETIS
   libMEDPARTITIONERTest_la_CPPFLAGS+= $(PARMETIS_CPPFLAGS)
   libMEDPARTITIONERTest_la_LDFLAGS+= $(PARMETIS_LIBS)
-else
+endif
 if MED_ENABLE_METIS
   libMEDPARTITIONERTest_la_CPPFLAGS += $(METIS_CPPFLAGS)
   libMEDPARTITIONERTest_la_LDFLAGS += $(METIS_LIBS)
@@ -58,7 +58,6 @@ if MED_ENABLE_SCOTCH
   libMEDPARTITIONERTest_la_CPPFLAGS += $(SCOTCH_CPPFLAGS)
   libMEDPARTITIONERTest_la_LDFLAGS += $(SCOTCH_LIBS)
 endif
-endif
 
 libMEDPARTITIONERTest_la_LDFLAGS += \
        $(MED3_LIBS_C_ONLY) \
@@ -80,14 +79,13 @@ TestMEDPARTITIONER_CPPFLAGS = $(libMEDPARTITIONERTest_la_CPPFLAGS) \
 
 if MPI_IS_OK
   TestMEDPARTITIONER_CPPFLAGS +=$(MPI_INCLUDES) $(PARMETIS_CPPFLAGS)
-else
+endif
 if MED_ENABLE_METIS
   TestMEDPARTITIONER_CPPFLAGS += $(METIS_CPPFLAGS)
 endif
 if MED_ENABLE_SCOTCH
   TestMEDPARTITIONER_CPPFLAGS += $(SCOTCH_CPPFLAGS)
 endif
-endif
 
 TestMEDPARTITIONER_LDADD = \
        $(libMEDPARTITIONERTest_la_LDFLAGS) -lm \