Merge from V6_main_20120808 08Aug12

[modules/geom.git] / src / OperationGUI / Makefile.am

diff --git a/src/OperationGUI/Makefile.am b/src/OperationGUI/Makefile.am
index 3afc0501389191653da1f9b8b02e96943e4a1bcd..3dc6da126598431292e0b54e0ab10475d60c420e 100644 (file)
--- a/src/OperationGUI/Makefile.am
+++ b/src/OperationGUI/Makefile.am
@@ -1,29 +1,25 @@
-#  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
-#
-# GEOM OPERATIONGUI : 
 # File    : Makefile.am
 # Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
 # Package : OperationGUI
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -32,9 +28,11 @@ salomeinclude_HEADERS =                              \
        OperationGUI_ArchimedeDlg.h             \
        OperationGUI_PartitionDlg.h             \
        OperationGUI_FilletDlg.h                \
-       OperationGUI_Fillet2dDlg.h              \
+       OperationGUI_Fillet1d2dDlg.h            \
        OperationGUI_ChamferDlg.h               \
        OperationGUI_GetShapesOnShapeDlg.h      \
+       OperationGUI_GetSharedShapesDlg.h       \
+       OperationGUI_ExtrudedFeatureDlg.h       \
        OperationGUI_ClippingDlg.h
 
 # Libraries targets
@@ -45,18 +43,22 @@ dist_libOperationGUI_la_SOURCES =           \
        OperationGUI_ArchimedeDlg.cxx           \
        OperationGUI_PartitionDlg.cxx           \
        OperationGUI_GetShapesOnShapeDlg.cxx    \
+       OperationGUI_GetSharedShapesDlg.cxx     \
        OperationGUI_FilletDlg.cxx              \
-       OperationGUI_Fillet2dDlg.cxx            \
+       OperationGUI_Fillet1d2dDlg.cxx          \
        OperationGUI_ChamferDlg.cxx             \
+       OperationGUI_ExtrudedFeatureDlg.cxx     \
        OperationGUI_ClippingDlg.cxx
 
 MOC_FILES =                                    \
        OperationGUI_ArchimedeDlg_moc.cxx       \
        OperationGUI_PartitionDlg_moc.cxx       \
        OperationGUI_GetShapesOnShapeDlg_moc.cxx\
+       OperationGUI_GetSharedShapesDlg_moc.cxx \
        OperationGUI_FilletDlg_moc.cxx          \
-       OperationGUI_Fillet2dDlg_moc.cxx        \
+       OperationGUI_Fillet1d2dDlg_moc.cxx      \
        OperationGUI_ChamferDlg_moc.cxx         \
+       OperationGUI_ExtrudedFeatureDlg_moc.cxx \
        OperationGUI_ClippingDlg_moc.cxx
 
 nodist_libOperationGUI_la_SOURCES =            \
@@ -74,6 +76,7 @@ libOperationGUI_la_CPPFLAGS =         \
        $(GUI_CXXFLAGS)                 \
        $(CORBA_CXXFLAGS)               \
        $(CORBA_INCLUDES)               \
+       $(OPENCV_INCLUDES)              \
        -I$(srcdir)/../GEOMGUI          \
        -I$(srcdir)/../DlgRef           \
        -I$(srcdir)/../GEOMBase         \
@@ -81,14 +84,15 @@ libOperationGUI_la_CPPFLAGS =               \
        -I$(srcdir)/../GEOMClient       \
        -I$(srcdir)/../GEOMImpl         \
        -I$(srcdir)/../GEOMAlgo         \
+       -I$(srcdir)/../GEOM             \
        -I$(top_builddir)/src/DlgRef    \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
+
 
 libOperationGUI_la_LDFLAGS =           \
        ../GEOMBase/libGEOMBase.la      \
-       $(CAS_LDPATH) -lTKFillet
-
+       $(CAS_LDPATH) -lTKFillet        \
+       $(OPENCV_LIBS)
 ###############################
 # Obsolete files ?
 ###############################