Merge from V6_main 28/02/2013

[tools/medcoupling.git] / src / MEDPartitioner / Makefile.am

diff --git a/src/MEDPartitioner/Makefile.am b/src/MEDPartitioner/Makefile.am
index c6039a03070dc2679fcd957a8009ffd8906d44b9..f494775187e9e994c268a1ab1067867fd1097f57 100644 (file)
--- a/src/MEDPartitioner/Makefile.am
+++ b/src/MEDPartitioner/Makefile.am
@@ -40,19 +40,19 @@ MEDPARTITIONER.hxx \
 MEDPARTITIONER_ParaDomainSelector.hxx \
 MEDPARTITIONER_ConnectZone.hxx \
 MEDPARTITIONER_SkyLineArray.hxx \
-MEDPARTITIONER_Topology.hxx
+MEDPARTITIONER_Topology.hxx \
+MEDPARTITIONER_metis.h
 
 #compilation of medpartitioner_para OR EXCLUSIVE medpartitioner
 if MED_ENABLE_PARMETIS
-    salomeinclude_HEADERS+= MEDPARTITIONER_MetisGraph.hxx
-else
+    salomeinclude_HEADERS+= MEDPARTITIONER_ParMetisGraph.hxx
+endif
 if MED_ENABLE_METIS
     salomeinclude_HEADERS += MEDPARTITIONER_MetisGraph.hxx
 endif
 if MED_ENABLE_SCOTCH
     salomeinclude_HEADERS += MEDPARTITIONER_ScotchGraph.hxx
 endif
-endif
 
 dist_libmedpartitioner_la_SOURCES= \
 MEDPARTITIONER_MeshCollection.cxx \
@@ -65,7 +65,8 @@ MEDPARTITIONER_UserGraph.cxx\
 MEDPARTITIONER_Utils.cxx \
 MEDPARTITIONER_ParaDomainSelector.cxx \
 MEDPARTITIONER_ConnectZone.cxx \
-MEDPARTITIONER_SkyLineArray.cxx
+MEDPARTITIONER_SkyLineArray.cxx \
+MEDPARTITIONER_metis.c
 
 if MPI_IS_OK
     dist_libmedpartitioner_la_SOURCES+= \
@@ -76,14 +77,13 @@ endif
 if MED_ENABLE_PARMETIS
     dist_libmedpartitioner_la_SOURCES+= \
     MEDPARTITIONER_ParMetisGraph.cxx
-else
+endif
 if MED_ENABLE_METIS
     dist_libmedpartitioner_la_SOURCES += MEDPARTITIONER_MetisGraph.cxx
 endif
 if MED_ENABLE_SCOTCH
     dist_libmedpartitioner_la_SOURCES += MEDPARTITIONER_ScotchGraph.cxx
 endif
-endif
 
 libmedpartitioner_la_CPPFLAGS= $(MPI_INCLUDES) $(MED3_INCLUDES) $(HDF5_INCLUDES) \
   $(LIBXML_INCLUDES) \
@@ -98,7 +98,7 @@ libmedpartitioner_la_LDFLAGS=
 if MED_ENABLE_PARMETIS
   libmedpartitioner_la_CPPFLAGS+= $(PARMETIS_CPPFLAGS)
   libmedpartitioner_la_LDFLAGS+= $(PARMETIS_LIBS)
-else
+endif
 if MED_ENABLE_METIS
   libmedpartitioner_la_CPPFLAGS += $(METIS_CPPFLAGS)
   libmedpartitioner_la_LDFLAGS += $(METIS_LIBS)
@@ -107,25 +107,25 @@ if MED_ENABLE_SCOTCH
   libmedpartitioner_la_CPPFLAGS += $(SCOTCH_CPPFLAGS)
   libmedpartitioner_la_LDFLAGS += $(SCOTCH_LIBS)
 endif
-endif
 
 libmedpartitioner_la_CXXFLAGS = @CXXTMPDPTHFLAGS@
 
 libmedpartitioner_la_LDFLAGS+= $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) $(STDLIB) $(LIBXML_LIBS) $(MPI_LIBS) ../INTERP_KERNEL/libinterpkernel.la ../MEDCoupling/libmedcoupling.la ../MEDLoader/libmedloader.la
 
 # Executables targets
+
+bin_PROGRAMS= medpartitioner
+dist_medpartitioner_SOURCES= medpartitioner.cxx
+medpartitioner_CPPFLAGS= $(libmedpartitioner_la_CPPFLAGS)
+medpartitioner_LDADD= $(libmedpartitioner_la_LDFLAGS) -lm libmedpartitioner.la
+medpartitioner_CXXFLAGS = @CXXTMPDPTHFLAGS@
+
 if MED_ENABLE_PARMETIS
-  bin_PROGRAMS=medpartitioner_para
+  bin_PROGRAMS+=medpartitioner_para
   dist_medpartitioner_para_SOURCES= medpartitioner_para.cxx
   medpartitioner_para_CPPFLAGS= $(libmedpartitioner_la_CPPFLAGS)
   medpartitioner_para_LDADD= $(libmedpartitioner_la_LDFLAGS) -lm libmedpartitioner.la
   medpartitioner_para_CXXFLAGS=@CXXTMPDPTHFLAGS@
-else
-  bin_PROGRAMS= medpartitioner
-  dist_medpartitioner_SOURCES= medpartitioner.cxx
-  medpartitioner_CPPFLAGS= $(libmedpartitioner_la_CPPFLAGS)
-  medpartitioner_LDADD= $(libmedpartitioner_la_LDFLAGS) -lm libmedpartitioner.la
-  medpartitioner_CXXFLAGS = @CXXTMPDPTHFLAGS@
 endif