From 89e728dad97592bb4027beb47df0c06fb7c629b2 Mon Sep 17 00:00:00 2001 From: prascle Date: Wed, 1 Feb 2006 15:10:38 +0000 Subject: [PATCH] PR: debug MPI optional compilation --- idl/Makefile.am | 8 ++++++-- src/MPIContainer/Makefile.am | 2 +- src/TestMPIContainer/Makefile.am | 11 ++++++----- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/idl/Makefile.am b/idl/Makefile.am index 139eeff84..c3527324d 100644 --- 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 30215a956..43fc715cd 100644 --- 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 7e62acef3..a054071ec 100644 --- 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) -- 2.39.2