X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBatch%2FMakefile.am;h=aaaa33e2b866b6ae9d0e9795832c370567951892;hb=fd34d295755a0494910172324d19b2e64f3febea;hp=9970832141d2c260743155af6d96625c1327d518;hpb=836c34a4e2dd99f1f302a2c3ae93a51cd182368f;p=modules%2Fkernel.git diff --git a/src/Batch/Makefile.am b/src/Batch/Makefile.am index 997083214..aaaa33e2b 100644 --- a/src/Batch/Makefile.am +++ b/src/Batch/Makefile.am @@ -18,7 +18,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 # # # @@ -59,7 +59,17 @@ LIB_INCLUDES = \ Batch_PyVersatile.hxx \ Batch_RunTimeException.hxx \ Batch_StringType.hxx \ - Batch_TypeMismatchException.hxx + Batch_TypeMismatchException.hxx \ + Batch_BatchManager_eClient.hxx \ + Batch_FactBatchManager_eClient.hxx \ + Batch_BatchManager_eLSF.hxx \ + Batch_FactBatchManager_eLSF.hxx \ + Batch_JobInfo_eLSF.hxx \ + Batch_BatchManager_ePBS.hxx \ + Batch_FactBatchManager_ePBS.hxx \ + Batch_JobInfo_ePBS.hxx \ + MpiImpl.hxx \ + Batch_Defines.hxx LIB_SRC = \ @@ -91,13 +101,23 @@ LIB_SRC = \ Batch_PyVersatile.cxx \ Batch_RunTimeException.cxx \ Batch_StringType.cxx \ - Batch_TypeMismatchException.cxx + Batch_TypeMismatchException.cxx \ + Batch_BatchManager_eClient.cxx \ + Batch_FactBatchManager_eClient.cxx \ + Batch_BatchManager_eLSF.cxx \ + Batch_FactBatchManager_eLSF.cxx \ + Batch_JobInfo_eLSF.cxx \ + Batch_BatchManager_ePBS.cxx \ + Batch_FactBatchManager_ePBS.cxx \ + Batch_JobInfo_ePBS.cxx \ + MpiImpl.cxx LIB_CPPFLAGS = \ - @PYTHON_INCLUDES@ \ + ${PYTHON_INCLUDES} \ -I$(srcdir)/../Basics \ - -I$(srcdir)/../SALOMELocalTrace + -I$(srcdir)/../SALOMELocalTrace \ + -I$(top_builddir)/salome_adm/unix LIB_LIBADD = \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ @@ -183,8 +203,8 @@ LIB_SRC += \ Batch_JobInfo_LSF.cxx \ Batch_Job_LSF.cxx -LIB_CPPFLAGS += @LSF_INCLUDES@ -LIB_LIBADD += @LSF_LIBDIR@ @LSF_LIBS@ +LIB_CPPFLAGS += ${LSF_INCLUDES} +LIB_LIBADD += ${LSF_LDFLAGS} ${LSF_LIBS} endif @@ -199,15 +219,6 @@ salomeinclude_HEADERS = $(LIB_INCLUDES) # lib_LTLIBRARIES = libSalomeBatch.la libSalomeBatch_la_SOURCES = $(LIB_SRC) -libSalomeBatch_la_CPPFLAGS = \ - @PYTHON_INCLUDES@ \ - -I$(srcdir)/../Basics \ - -I$(srcdir)/../SALOMELocalTrace \ - -I$(top_builddir)/salome_adm/unix \ - $(LIB_CPPFLAGS) - +libSalomeBatch_la_CPPFLAGS = ${LIB_CPPFLAGS} libSalomeBatch_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeBatch_la_LIBADD = \ - ../SALOMELocalTrace/libSALOMELocalTrace.la \ - ../Basics/libSALOMEBasics.la \ - $(LIB_LIBADD) +libSalomeBatch_la_LIBADD = $(LIB_LIBADD)