merge from branch BR_For40_DSC tag mergeto_V4_1_0_maintainance_29may08

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 3b43eb7e18d65a1c1e952abba7f9c100769ab3c7..82efa8787d72eda06c27b4150a6b6f15394a72ed 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
@@ -27,10 +27,10 @@
 SUBDIR_BASE = \
   Basics \
   SALOMELocalTrace \
-  CASCatch \
   HDFPersist
 
 SUBDIR_CORBA = \
+  DF \
   Logger \
   SALOMETraceCollector \
   Utils \
@@ -38,13 +38,12 @@ SUBDIR_CORBA = \
   GenericObj \
   Registry \
   ModuleCatalog \
-  DataTypeCatalog \
-  RessourcesCatalog \
   ResourcesManager \
   Notification \
   NOTIFICATION_SWIG \
   Container \
   TestContainer \
+  Launcher \
   LifeCycleCORBA \
   LifeCycleCORBA_SWIG \
   SALOMEDSClient \
@@ -54,7 +53,8 @@ SUBDIR_CORBA = \
   KERNEL_PY \
   ModuleGenerator \
   Communication \
-  Communication_SWIG
+  Communication_SWIG \
+  DSC
 
 SUBDIR_CPPUNIT_BASE= \
   Basics/Test \
@@ -66,6 +66,7 @@ SUBDIR_CPPUNIT_CORBA = \
   Utils/Test \
   NamingService/Test \
   LifeCycleCORBA/Test \
+  LifeCycleCORBA_SWIG/Test \
   SALOMEDSImpl/Test \
   SALOMEDS/Test
 
@@ -80,10 +81,14 @@ SUBDIR_BATCH= \
   Batch \
   Batch_SWIG
 
+SUBDIR_PARALLEL= ParallelContainer
+                
+
 DIST_SUBDIRS = \
   $(SUBDIR_BASE) \
   $(SUBDIR_CORBA) \
   $(SUBDIR_MPI) \
+  $(SUBDIR_PARALLEL) \
   $(SUBDIR_BATCH) \
   $(SUBDIR_CPPUNIT_BASE) \
   $(SUBDIR_CPPUNIT_CORBA) \
@@ -97,20 +102,30 @@ DIST_SUBDIRS = \
 
 SUBDIRS = $(SUBDIR_BASE)
 
+if WITH_BATCH
+  SUBDIRS += $(SUBDIR_BATCH)
+endif
+
 if CORBA_GEN
   SUBDIRS += $(SUBDIR_CORBA)
 endif
 
-if MPI_IS_OK
-  SUBDIRS += $(SUBDIR_MPI)
-endif
-
-if WITH_BATCH
-  SUBDIRS += $(SUBDIR_BATCH)
-endif
+#if MPI_IS_OK
+#  SUBDIRS += $(SUBDIR_MPI)
+#endif
 
 if CPPUNIT_IS_OK
-  SUBDIRS += $(SUBDIR_CPPUNIT_BASE)
-  SUBDIRS += $(SUBDIR_CPPUNIT_CORBA)
-  SUBDIRS += $(SUBDIR_CPPUNIT_GENERAL)
+if CORBA_GEN
+  SUBDIRS += \
+       $(SUBDIR_CPPUNIT_BASE)   \
+       $(SUBDIR_CPPUNIT_CORBA)  \
+       $(SUBDIR_CPPUNIT_GENERAL)
+else
+  SUBDIRS += \
+       $(SUBDIR_CPPUNIT_BASE)   \
+       $(SUBDIR_CPPUNIT_GENERAL)
+endif
+endif
+if WITH_PACO_PARALLEL
+SUBDIRS += $(SUBDIR_PARALLEL)
 endif