CCAR: delete the notification supplier CORBA object with deactivate_object and _remov...

[modules/kernel.git] / src / Container / Makefile.am

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 5f8172cff83bad609ce0e7e3ee4a0158f7669f2e..c3a870cbe4daed1d0ebf494080ad55470005b887 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -44,8 +44,9 @@ salomeinclude_HEADERS = \
        Salome_file_i.hxx
 
 # Scripts to be installed
-dist_salomescript_DATA =\
+dist_salomescript_PYTHON =\
        SALOME_ComponentPy.py \
+  SALOME_PyNode.py \
        SALOME_Container.py
 
 # These files are executable scripts
@@ -61,9 +62,7 @@ dist_salomescript_SCRIPTS=\
 # This local variable defines the list of CPPFLAGS common to all target in this package.
 COMMON_CPPFLAGS=\
        @PYTHON_INCLUDES@ \
-       @MPI_INCLUDES@ \
        @HDF5_INCLUDES@ \
-       -I$(srcdir)/../Batch \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
        -I$(srcdir)/../NamingService \
@@ -72,7 +71,6 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../Notification \
        -I$(srcdir)/../ResourcesManager \
        -I$(srcdir)/../HDFPersist \
-       -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@
 
@@ -87,12 +85,15 @@ COMMON_LIBS =\
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
        ../HDFPersist/libSalomeHDFPersist.la \
-       ../Batch/libSalomeBatch.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la \
-       @MPI_LIBS@ \
        @CORBA_LIBS@ \
        $(PYTHON_LIBS)
 
+if WITH_MPI_SEQ_CONTAINER      
+COMMON_CPPFLAGS += @MPI_INCLUDES@
+COMMON_LIBS += @MPI_LIBS@
+endif
+
 #
 # ===============================================================
 # Libraries targets
@@ -142,10 +143,13 @@ SALOME_Container_LDADD = \
        libSalomeContainer.la \
        ../Basics/libSALOMEBasics.la \
        $(HDF5_LIBS) \
-       $(MPI_LIBS) \
        $(CORBA_LIBS) \
        $(PYTHON_LIBS)
 
+if WITH_MPI_SEQ_CONTAINER      
+SALOME_Container_LDADD += $(MPI_LIBS)
+endif
+
 SALOME_Container_LDFLAGS  =\
 -Xlinker -export-dynamic
 
@@ -159,6 +163,10 @@ TestSalome_file_LDADD =\
        libSalomeContainer.la \
        ../Basics/libSALOMEBasics.la \
        $(HDF5_LIBS) \
-       $(MPI_LIBS) \
        $(CORBA_LIBS) \
        $(PYTHON_LIBS)
+
+install-data-hook:
+       @for f in $(dist_salomescript_PYTHON) ; do \
+          chmod -f a+x $(DESTDIR)$(salomescriptdir)/$$f ; \
+        done