X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FEntityGUI%2FMakefile.am;h=a1fbbcb93783ae7a0465533c3340ce7a7f72f1aa;hb=c8ae1da7b2988de253fec52eb7583a5b0f291209;hp=1508f378f388dfbe1ecd52fc63be4e248b2cc4b9;hpb=4ca918905cef7c33f2e6517e95acc7d4f669cb6d;p=modules%2Fgeom.git

diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am
index 1508f378f..a1fbbcb93 100644
--- a/src/EntityGUI/Makefile.am
+++ b/src/EntityGUI/Makefile.am
@@ -1,20 +1,20 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  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 ENTITYGUI : 
@@ -24,6 +24,17 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if WITH_OPENCV
+  FeatureDetectorDlg_Header = EntityGUI_FeatureDetectorDlg.h
+  FeatureDetectorDlg_Sources = EntityGUI_FeatureDetectorDlg.cxx
+  FeatureDetectorDlg_moc = EntityGUI_FeatureDetectorDlg_moc.cxx
+  PictureImportDlg_Header = EntityGUI_PictureImportDlg.h
+  PictureImportDlg_Sources = EntityGUI_PictureImportDlg.cxx
+  PictureImportDlg_moc = EntityGUI_PictureImportDlg_moc.cxx
+  Opencv_libs = $(OPENCV_LIBS)
+  Opencv_includes = $(OPENCV_INCLUDES)
+endif
+
 # Libraries targets
 lib_LTLIBRARIES = libEntityGUI.la
 
@@ -33,27 +44,33 @@ salomeinclude_HEADERS =			\
 	EntityGUI_Widgets.h		\
 	EntityGUI_SketcherDlg.h		\
 	EntityGUI_3DSketcherDlg.h	\
-	EntityGUI_SubShapeDlg.h	
+	EntityGUI_SubShapeDlg.h		\
+	$(FeatureDetectorDlg_Header)	\
+	$(PictureImportDlg_Header)
 
 dist_libEntityGUI_la_SOURCES = 		\
 	EntityGUI.cxx			\
 	EntityGUI_Widgets.cxx		\
 	EntityGUI_SketcherDlg.cxx	\
 	EntityGUI_3DSketcherDlg.cxx	\
-	EntityGUI_SubShapeDlg.cxx
+	EntityGUI_SubShapeDlg.cxx	\
+	$(FeatureDetectorDlg_Sources)	\
+	$(PictureImportDlg_Sources)
 
 MOC_FILES =				\
 	EntityGUI_Widgets_moc.cxx	\
 	EntityGUI_SketcherDlg_moc.cxx	\
 	EntityGUI_3DSketcherDlg_moc.cxx	\
-	EntityGUI_SubShapeDlg_moc.cxx
+	EntityGUI_SubShapeDlg_moc.cxx	\
+	$(FeatureDetectorDlg_moc)	\
+	$(PictureImportDlg_moc)	
 
 nodist_libEntityGUI_la_SOURCES =	\
 	 $(MOC_FILES)
 
 UIC_FILES =				\
 	ui_EntityGUI_1Sel_QTD.h		\
-	ui_EntityGUI_2Sel1Check_QTD.h	\  	
+	ui_EntityGUI_2Sel1Check_QTD.h	\
 	ui_EntityGUI_1Sel1Spin1Check_QTD.h	\
 	ui_EntityGUI_1Spin_QTD.h	\
 	ui_EntityGUI_2Spin_QTD.h	\
@@ -80,6 +97,7 @@ libEntityGUI_la_CPPFLAGS =			\
 	$(GUI_CXXFLAGS)				\
 	$(CORBA_CXXFLAGS)			\
 	$(CORBA_INCLUDES)			\
+	$(Opencv_includes)			\
 	-I$(srcdir)/../GEOMGUI			\
 	-I$(srcdir)/../DlgRef			\
 	-I$(srcdir)/../GEOMBase 		\
@@ -88,6 +106,8 @@ libEntityGUI_la_CPPFLAGS =			\
 	-I$(srcdir)/../GEOMImpl			\
 	-I$(srcdir)/../GEOMFiltersSelection	\
 	-I$(srcdir)/../SKETCHER			\
+	-I$(srcdir)/../ShapeRecognition		\
+	-I$(srcdir)/../GEOM			\
 	-I$(top_builddir)/src/DlgRef		\
 	-I$(top_builddir)/idl
 
@@ -96,6 +116,7 @@ libEntityGUI_la_LDFLAGS  =					\
 	../GEOMBase/libGEOMBase.la				\
 	../SKETCHER/libGEOMSketcher.la				\
 	../GEOMGUI/libGEOM.la 					\
+	../ShapeRecognition/libGEOMShapeRec.la			\
 	$(QT_MT_LIBS)						\
-	$(CAS_TKTopAlgo) -lTKernel
-
+	$(CAS_TKTopAlgo) -lTKernel				\
+	$(Opencv_libs)