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 2d202204b768bdee6d1cf41531aa01c2773fbbdb..9331f6bfdc2dbf72634a0674c481e1b0e41119a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  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
@@ -19,6 +19,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.am
 #  Author : Guillaume Boulant (CSSI)
 #  Module : KERNEL
@@ -27,7 +28,8 @@
 SUBDIR_BASE = \
   Basics \
   SALOMELocalTrace \
-  HDFPersist
+  HDFPersist\
+  KERNEL_PY
 
 SUBDIR_CORBA = \
   DF \
@@ -50,7 +52,6 @@ SUBDIR_CORBA = \
   TOOLSDS \
   SALOMEDSImpl \
   SALOMEDS \
-  KERNEL_PY \
   ModuleGenerator \
   Communication \
   Communication_SWIG \
@@ -77,10 +78,6 @@ SUBDIR_MPI = \
   MPIContainer \
   TestMPIContainer
 
-SUBDIR_BATCH= \
-  Batch \
-  Batch_SWIG
-
 SUBDIR_PARALLEL= ParallelContainer
                 
 
@@ -89,7 +86,6 @@ DIST_SUBDIRS = \
   $(SUBDIR_CORBA) \
   $(SUBDIR_MPI) \
   $(SUBDIR_PARALLEL) \
-  $(SUBDIR_BATCH) \
   $(SUBDIR_CPPUNIT_BASE) \
   $(SUBDIR_CPPUNIT_CORBA) \
   $(SUBDIR_CPPUNIT_GENERAL)
@@ -101,15 +97,11 @@ DIST_SUBDIRS = \
 #
 
 if WITHONLYLAUNCHER
-  SUBDIRS = Batch Batch_SWIG ResourcesManager Launcher
+  SUBDIRS = Basics ResourcesManager Launcher
 else
 
 SUBDIRS = $(SUBDIR_BASE)
 
-if WITH_BATCH
-  SUBDIRS += $(SUBDIR_BATCH)
-endif
-
 if CORBA_GEN
   SUBDIRS += $(SUBDIR_CORBA)
 endif