Fix configuration / compilation problems in KERNEL with libBatch (caused by wrong...

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

diff --git a/src/Makefile.am b/src/Makefile.am
index aa21ac33abf652d48fc31785542dcdcbc2f363ed..9331f6bfdc2dbf72634a0674c481e1b0e41119a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,36 +1,38 @@
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
-# 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
-# 
-#  You should have received a copy of the GNU Lesser General Public 
-#  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 
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
 #
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
 #  File   : Makefile.am
 #  Author : Guillaume Boulant (CSSI)
 #  Module : KERNEL
 # $Header$
-
+#
 SUBDIR_BASE = \
   Basics \
   SALOMELocalTrace \
-  CASCatch \
-  HDFPersist
+  HDFPersist\
+  KERNEL_PY
 
 SUBDIR_CORBA = \
+  DF \
   Logger \
   SALOMETraceCollector \
   Utils \
@@ -43,16 +45,17 @@ SUBDIR_CORBA = \
   NOTIFICATION_SWIG \
   Container \
   TestContainer \
+  Launcher \
   LifeCycleCORBA \
   LifeCycleCORBA_SWIG \
   SALOMEDSClient \
   TOOLSDS \
   SALOMEDSImpl \
   SALOMEDS \
-  KERNEL_PY \
   ModuleGenerator \
   Communication \
-  Communication_SWIG
+  Communication_SWIG \
+  DSC
 
 SUBDIR_CPPUNIT_BASE= \
   Basics/Test \
@@ -75,15 +78,14 @@ SUBDIR_MPI = \
   MPIContainer \
   TestMPIContainer
 
-SUBDIR_BATCH= \
-  Batch \
-  Batch_SWIG
+SUBDIR_PARALLEL= ParallelContainer
+                
 
 DIST_SUBDIRS = \
   $(SUBDIR_BASE) \
   $(SUBDIR_CORBA) \
   $(SUBDIR_MPI) \
-  $(SUBDIR_BATCH) \
+  $(SUBDIR_PARALLEL) \
   $(SUBDIR_CPPUNIT_BASE) \
   $(SUBDIR_CPPUNIT_CORBA) \
   $(SUBDIR_CPPUNIT_GENERAL)
@@ -94,6 +96,10 @@ DIST_SUBDIRS = \
 # check_cppunit for example with CPPUNIT_IS_OK.
 #
 
+if WITHONLYLAUNCHER
+  SUBDIRS = Basics ResourcesManager Launcher
+else
+
 SUBDIRS = $(SUBDIR_BASE)
 
 if CORBA_GEN
@@ -104,12 +110,21 @@ if MPI_IS_OK
   SUBDIRS += $(SUBDIR_MPI)
 endif
 
-if WITH_BATCH
-  SUBDIRS += $(SUBDIR_BATCH)
+if CPPUNIT_IS_OK
+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
 
-if CPPUNIT_IS_OK
-  SUBDIRS += $(SUBDIR_CPPUNIT_BASE)
-  SUBDIRS += $(SUBDIR_CPPUNIT_CORBA)
-  SUBDIRS += $(SUBDIR_CPPUNIT_GENERAL)
 endif
+EXTRA_DIST = win32pm