Merge from V6_main 11/02/2013

[modules/jobmanager.git] / src / salomegui / Makefile.am

diff --git a/src/salomegui/Makefile.am b/src/salomegui/Makefile.am
index c9167027c27867292405a533f2999d0bd165d7a7..8a01eab38015c56d11967549e348e644a8b75cf9 100644 (file)
--- a/src/salomegui/Makefile.am
+++ b/src/salomegui/Makefile.am
@@ -1,20 +1,20 @@
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+# Copyright (C) 2009-2012  CEA/DEN, EDF R&D
 #
-#  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 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.
+# 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
+# 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
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
 include $(top_srcdir)/src/bases/make_begin.am
@@ -28,7 +28,10 @@ dist_libJOBMANAGER_la_SOURCES = BL_SalomeGui.hxx BL_SalomeGui.cxx
 nodist_libJOBMANAGER_la_SOURCES = $(MOC_FILES)
 
 libJOBMANAGER_la_CXXFLAGS = $(qt4_cppflags) \
-                               $(OMNIORB_INCLUDES) \
+                               $(BOOST_CPPFLAGS) \
+                               $(OMNIORB_INCLUDES) $(OMNIORB_CXXFLAGS) \
+                               -I$(top_builddir)/idl \
+                               -I. \
                                -I$(KERNEL_ROOT_DIR)/include/salome \
                                -I$(GUI_ROOT_DIR)/include/salome \
                                -I$(top_srcdir)/src/genericgui \
@@ -41,6 +44,8 @@ libJOBMANAGER_la_LDFLAGS  = -L$(GUI_ROOT_DIR)/lib/salome \
                                $(qt4_ldflags)
 
 libJOBMANAGER_la_LIBADD  = $(qt4_libs) \
+                          $(top_builddir)/idl/libJOBMANAGER_IDL.la \
+                          @OMNIORB_LIBS@ \
                               $(top_builddir)/src/bases/libBL_Bases.la \
                               $(top_builddir)/src/engine/libBL_Engine.la \
                               $(top_builddir)/src/genericgui/libBL_GenericGui.la \
@@ -48,11 +53,14 @@ libJOBMANAGER_la_LIBADD  = $(qt4_libs) \
                               -lSalomeApp
 
 salomeinclude_HEADERS = BL_SalomeGui.hxx
+salomeinclude_DATA = JOBMANAGER_version.h
 
 # resources files
-LIBICONS = SalomeApp.xml jobmanager.png
+ICONS = resources/jobmanager.png
+
+nodist_salomeres_SCRIPTS = resources/SalomeApp.xml
+
 dist_salomeres_DATA = ${ICONS}
-ICONS = $(LIBICONS:%=resources/%)
 
 # --------------------------------------------
 # *.h --> *_moc.cxx