From 56577e6e227f62c927a31013bcb013f691720e19 Mon Sep 17 00:00:00 2001
From: cvw <cvw>
Date: Wed, 21 Mar 2012 14:52:42 +0000
Subject: [PATCH] *** empty log message ***

---
 src/MEDPartitioner/Makefile.am      | 37 ++++++++++++++---------------
 src/MEDPartitioner/Test/Makefile.am | 13 ++++++++++
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/MEDPartitioner/Makefile.am b/src/MEDPartitioner/Makefile.am
index 06db0a502..b04a9a0ad 100644
--- a/src/MEDPartitioner/Makefile.am
+++ b/src/MEDPartitioner/Makefile.am
@@ -115,9 +115,26 @@ libmedpartitioner_la_LDFLAGS += \
 	../MEDLoader/libmedloader.la
 
 # Executables targets
+bin_PROGRAMS = medpartitioner
+dist_medpartitioner_SOURCES = medpartitioner.cxx
+medpartitioner_CPPFLAGS = \
+	-I$(srcdir)/../INTERP_KERNEL/Bases \
+	-I$(srcdir)/../MEDCoupling \
+	-I$(srcdir)/../MEDLoader \
+	-I$(srcdir)/../INTERP_KERNEL
+
+if MED_ENABLE_METIS
+  medpartitioner_CPPFLAGS += $(METIS_CPPFLAGS)
+endif
+if MED_ENABLE_SCOTCH
+  medpartitioner_CPPFLAGS += $(SCOTCH_CPPFLAGS)
+endif
+
+medpartitioner_LDADD = libmedpartitioner.la
+
 if MPI_IS_OK
  
-  bin_PROGRAMS = medpartitioner_para
+  bin_PROGRAMS += medpartitioner_para
   dist_medpartitioner_para_SOURCES = medpartitioner_para.cxx
   medpartitioner_para_CPPFLAGS = \
 	-I$(srcdir)/../INTERP_KERNEL/Bases \
@@ -129,24 +146,6 @@ if MPI_IS_OK
 
   medpartitioner_para_LDADD = libmedpartitioner.la
 
-else !MPI_IS_OK
-
-  bin_PROGRAMS = medpartitioner
-  dist_medpartitioner_SOURCES = medpartitioner.cxx
-  medpartitioner_CPPFLAGS = \
-	-I$(srcdir)/../INTERP_KERNEL/Bases \
-	-I$(srcdir)/../MEDCoupling \
-	-I$(srcdir)/../MEDLoader \
-	-I$(srcdir)/../INTERP_KERNEL
-
-if MED_ENABLE_METIS
-  medpartitioner_CPPFLAGS += $(METIS_CPPFLAGS)
-endif
-if MED_ENABLE_SCOTCH
-  medpartitioner_CPPFLAGS += $(SCOTCH_CPPFLAGS)
-endif
-
-  medpartitioner_LDADD = libmedpartitioner.la
 endif
 
 OBSOLETE_FILES =
diff --git a/src/MEDPartitioner/Test/Makefile.am b/src/MEDPartitioner/Test/Makefile.am
index 83053a6e3..175696fc9 100644
--- a/src/MEDPartitioner/Test/Makefile.am
+++ b/src/MEDPartitioner/Test/Makefile.am
@@ -61,6 +61,19 @@ bin_PROGRAMS = TestMEDPARTITIONER
 TestMEDPARTITIONER_SOURCES = TestMEDPARTITIONER.cxx
 TestMEDPARTITIONER_CPPFLAGS = $(libMEDPARTITIONERTest_la_CPPFLAGS) 
 
+if MPI_IS_OK
+  TestMEDPARTITIONER_CPPFLAGS +=
+	$(MPI_INCLUDES) \
+	$(PARMETIS_CPPFLAGS)
+else
+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 \
 	libMEDPARTITIONERTest.la \
-- 
2.39.2