PR: debug MPI optional compilation

diff --git a/idl/Makefile.am b/idl/Makefile.am
index 139eeff84c61930982c068b974fe3695777f9a74..c3527324de21782de087eebfa9020cf01b668504 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -20,13 +20,17 @@ IDL_FILES = \
   SALOME_ContainerManager.idl \
   SALOME_TestComponent.idl \
   SALOME_Registry.idl \
-  SALOME_MPIObject.idl \
-  SALOME_MPIContainer.idl \
   Logger.idl \
   SALOME_GenericObj.idl \
   SALOME_TestModuleCatalog.idl \
   nstest.idl
 
+if MPI_IS_OK
+  IDL_FILES+= SALOME_MPIObject.idl \
+  SALOME_MPIContainer.idl \
+  SALOME_TestMPIComponent.idl  
+endif
+
 # This variable defines the files to be installed
 salomeidl_DATA = $(IDL_FILES)
 

diff --git a/src/MPIContainer/Makefile.am b/src/MPIContainer/Makefile.am
index 30215a9564bec7db3c06ea5be84ebbf6e3cfcda6..43fc715cd4c120d9c0465870eeb958eeb17772c6 100644 (file)
--- a/src/MPIContainer/Makefile.am
+++ b/src/MPIContainer/Makefile.am
@@ -66,12 +66,12 @@ COMMON_CPPFLAGS=\
        @MPI_INCLUDES@ \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
-       -I$(srcdir)/../SALOMETraceCollector \
        -I$(srcdir)/../NamingService \
        -I$(srcdir)/../Utils \
        -I$(srcdir)/../Registry \
        -I$(srcdir)/../Notification \
        -I$(srcdir)/../ResourcesManager \
+       -I$(srcdir)/../Container \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@

diff --git a/src/TestMPIContainer/Makefile.am b/src/TestMPIContainer/Makefile.am
index 7e62acef3e45fc0415ec492db5779f0481689bbd..a054071ecaa72dad0249fc77c05ad100337a6601 100644 (file)
--- a/src/TestMPIContainer/Makefile.am
+++ b/src/TestMPIContainer/Makefile.am
@@ -53,7 +53,6 @@ salomeinclude_HEADERS = TestMPIComponentEngine.hxx
 # Sources built from idl files
 BUILT_SOURCES =\
        $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \
-       $(top_builddir)/idl/SALOME_Logger.hh $(top_builddir)/idl/SALOME_LoggerSK.cc \
        $(top_builddir)/idl/SALOME_MPIObject.hh $(top_builddir)/idl/SALOME_MPIObjectSK.cc \
        $(top_builddir)/idl/SALOME_TestMPIComponent.hh $(top_builddir)/idl/SALOME_TestMPIComponentSK.cc
 
@@ -64,12 +63,13 @@ COMMON_CPPFLAGS=\
        @MPI_INCLUDES@ \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
-       -I$(srcdir)/../SALOMETraceCollector \
        -I$(srcdir)/../NamingService \
        -I$(srcdir)/../Utils \
        -I$(srcdir)/../Registry \
        -I$(srcdir)/../Notification \
        -I$(srcdir)/../ResourcesManager \
+       -I$(srcdir)/../Container \
+       -I$(srcdir)/../MPIContainer \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
@@ -84,6 +84,7 @@ COMMON_LIBS =\
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
        ../Container/libSalomeContainer.la \
+       ../MPIContainer/libSalomeMPIContainer.la \
        @CORBA_LIBS@
 
 #
@@ -105,6 +106,6 @@ libSalomeTestMPIComponentEngine_la_LIBADD   = $(COMMON_LIBS)
 # ===============================================================
 #
 bin_PROGRAMS = TestMPIContainer
-SALOME_TestMPIContainer_SOURCES = TestMPIContainer.cxx
-SALOME_TestMPIContainer_LDADD   = libSalomeTestMPIComponentEngine.la $(COMMON_LIBS) @MPI_LIBS@
-SALOME_TestMPIContainer_CPPFLAGS = $(COMMON_CPPFLAGS)
+TestMPIContainer_SOURCES = TestMPIContainer.cxx
+TestMPIContainer_LDADD   = libSalomeTestMPIComponentEngine.la $(COMMON_LIBS) @MPI_LIBS@
+TestMPIContainer_CPPFLAGS = $(COMMON_CPPFLAGS)