Merge from V6_main_20120808 08Aug12

[plugins/netgenplugin.git] / src / GUI / Makefile.am

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index a2f52dceeea514c1f7628c9624a3d722f8b6135e..537055e932b6e2b48f96199e7b3c7b50c7b1c17e 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -1,24 +1,22 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  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
+# 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
 #
+
 #  File   : Makefile.in
 #  Author : Michael Sazonov
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
@@ -51,8 +49,9 @@ nodist_libNETGENPluginGUI_la_SOURCES= \
 # additionnal information to compil and link file
 
 libNETGENPluginGUI_la_CPPFLAGS = \
-       $(QT_INCLUDES) \
        $(CAS_CPPFLAGS) \
+       $(NETGEN_INCLUDES) \
+       $(QT_INCLUDES) \
        $(PYTHON_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        $(GUI_CXXFLAGS) \
@@ -63,16 +62,19 @@ libNETGENPluginGUI_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        -I$(srcdir)/../NETGENPlugin \
-       -I$(top_builddir)/idl \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libNETGENPluginGUI_la_LDFLAGS  = \
+       ../../idl/libSalomeIDLNETGENPLUGIN.la \
        ../NETGENPlugin/libNETGENEngine.la \
-       ${SMESH_LDFLAGS} -lSMESH \
+       ${QT_MT_LIBS} \
+       ${GUI_LDFLAGS} -lSalomeApp -lqtx -lsuit -lSalomeObject -lLightApp \
+       ${SMESH_LDFLAGS} -lSMESH -lGeomSelectionTools \
        $(CAS_KERNEL)
 
 # resources files
 nodist_salomeres_DATA= \
        NETGENPlugin_images.qm \
-       NETGENPlugin_msg_en.qm
+       NETGENPlugin_msg_en.qm \
+       NETGENPlugin_msg_fr.qm