- Launcher can now load and save its jobs list

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

diff --git a/src/Launcher/Makefile.am b/src/Launcher/Makefile.am
index 574c04b33f2e513aa43ddf07eee721ccb7162995..ad3e8eab9d80b91993f3d68ceec2b61ee0584e3c 100644 (file)
--- a/src/Launcher/Makefile.am
+++ b/src/Launcher/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
 #
+
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 #
@@ -33,6 +34,12 @@ salomeinclude_HEADERS = \
   BatchTest.hxx \
   SALOME_Launcher_defs.hxx \
   SALOME_Launcher.hxx \
+  Launcher_Utils.hxx \
+  Launcher_Job.hxx \
+  Launcher_Job_Command.hxx \
+  Launcher_Job_SALOME.hxx \
+  Launcher_Job_PythonSALOME.hxx \
+  Launcher_Job_YACSFile.hxx \
   Launcher.hxx
 
 # Scripts to be installed
@@ -52,7 +59,7 @@ COMMON_CPPFLAGS=\
        @PYTHON_INCLUDES@ \
        @MPI_INCLUDES@ \
        @LIBXML_INCLUDES@ \
-       -I$(srcdir)/../Batch \
+       @LIBBATCH_INCLUDES@ \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
        -I$(srcdir)/../NamingService \
@@ -64,6 +71,10 @@ COMMON_CPPFLAGS=\
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
+if WITH_LIBBATCH
+  COMMON_CPPFLAGS += -DWITH_LIBBATCH
+endif
+
 # This local variable defines the list of dependant libraries common to all target in this package.
 COMMON_LIBS =\
        ../Registry/libRegistry.la \
@@ -74,8 +85,8 @@ COMMON_LIBS =\
        ../Utils/libOpUtil.la \
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
-       ../Batch/libSalomeBatch.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la \
+       @LIBBATCH_LIBS@ \
        @MPI_LIBS@ \
        @CORBA_LIBS@ \
        @LIBXML_LIBS@ \
@@ -108,21 +119,32 @@ libSalomeLauncher_la_LIBADD =\
 libLauncher_la_SOURCES=\
        SALOME_Launcher_Parser.cxx \
        SALOME_Launcher_Handler.cxx  \
+       Launcher_Utils.hxx \
+       Launcher_Job.cxx \
+       Launcher_Job_Command.cxx \
+       Launcher_Job_SALOME.cxx \
+       Launcher_Job_PythonSALOME.cxx \
+       Launcher_Job_YACSFile.cxx \
        Launcher.cxx
 
 libLauncher_la_CPPFLAGS =\
-       -I$(srcdir)/../Batch \
+       -I$(srcdir)/../Basics \
        -I$(srcdir)/../ResourcesManager \
+       @LIBBATCH_INCLUDES@ \
        @MPI_INCLUDES@ \
        @LIBXML_INCLUDES@
 
+if WITH_LIBBATCH
+  libLauncher_la_CPPFLAGS += -DWITH_LIBBATCH
+endif
+
 libLauncher_la_LDFLAGS  =\
        -no-undefined -version-info=0:0:0 \
        @LDEXPDYNFLAGS@
 
 libLauncher_la_LIBADD =\
-       ../Batch/libSalomeBatch.la \
        ../ResourcesManager/libResourcesManager.la \
+       @LIBBATCH_LIBS@ \
        @MPI_LIBS@ \
        @LIBXML_LIBS@
 
@@ -144,6 +166,7 @@ SALOME_LauncherServer_CPPFLAGS=\
 SALOME_LauncherServer_LDADD =\
        libSalomeLauncher.la \
        ../Basics/libSALOMEBasics.la \
+       $(LIBBATCH_LIBS) \
        $(MPI_LIBS) \
        $(CORBA_LIBS) \
        $(LIBXML_LIBS) \