Try to kill Salome application when a YACS Launcher job is killed

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

diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am
index 5a810d7940750caa9ac7995662d7abac3b26ca13..f6c8337f4aa5cc943d6be767b5d9c541c093e7b8 100644 (file)
--- a/src/ModuleCatalog/Makefile.am
+++ b/src/ModuleCatalog/Makefile.am
@@ -1,31 +1,31 @@
-#  SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules
+# Copyright (C) 2007-2011  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
 #
-#  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 
+# 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
+#
+
+#  SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules
 #  File   : Makefile.am
 #  Author : Guillaume Boulant (CSSI)
 #  Module : SALOME
 #  $Header$
-
+#
 include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 
 #
@@ -40,10 +40,11 @@ salomeinclude_HEADERS = \
                PathPrefix.hxx \
                SALOME_ModuleCatalog_Parser.hxx \
                SALOME_ModuleCatalog_Parser_IO.hxx \
-                SALOME_ModuleCatalog_Handler.hxx 
+                SALOME_ModuleCatalog_Handler.hxx \
+               SALOME_ModuleCatalog.hxx
 
 # Scripts to be installed
-dist_salomescript_DATA = SALOME_TestModuleCatalog.py
+dist_salomescript_PYTHON = TestModuleCatalog.py
 
 
 #
@@ -59,10 +60,9 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../SALOMELocalTrace \
        -I$(srcdir)/../NamingService \
        -I$(srcdir)/../Utils \
-       -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
-       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \
-       @QT_MT_INCLUDES@
+       @LIBXML_INCLUDES@ \
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
 # This local variable defines the list of dependant libraries common to all target in this package.
 COMMON_LIBS =\
@@ -70,7 +70,8 @@ COMMON_LIBS =\
        ../Utils/libOpUtil.la \
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
-       $(top_builddir)/idl/libSalomeIDLKernel.la
+       $(top_builddir)/idl/libSalomeIDLKernel.la \
+       @LIBXML_LIBS@
 
 libSalomeCatalog_la_SOURCES =\
        SALOME_ModuleCatalog_Handler.cxx  \
@@ -84,8 +85,7 @@ libSalomeCatalog_la_CPPFLAGS =\
 libSalomeCatalog_la_LDFLAGS = -no-undefined -version-info=0:0:0
 
 libSalomeCatalog_la_LIBADD  =\
-       $(COMMON_LIBS) \
-       @QT_MT_LIBS@
+       $(COMMON_LIBS)
 
 
 #
@@ -101,8 +101,7 @@ SALOME_ModuleCatalog_Server_CPPFLAGS =\
        $(COMMON_CPPFLAGS) 
 
 SALOME_ModuleCatalog_Server_LDADD   =\
-       libSalomeCatalog.la \
-       $(COMMON_LIBS) \
+       libSalomeCatalog.la ${COMMON_LIBS} \
        @CORBA_LIBS@
 
 # SALOME_ModuleCatalog_Client
@@ -111,6 +110,5 @@ SALOME_ModuleCatalog_Client_CPPFLAGS =\
        $(COMMON_CPPFLAGS)
 
 SALOME_ModuleCatalog_Client_LDADD   =\
-       libSalomeCatalog.la \
-       $(COMMON_LIBS) \
+       libSalomeCatalog.la ${COMMON_LIBS} \
        @CORBA_LIBS@