X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMGUI%2FMakefile.am;h=54f6e94fb95ee0186928aed40599463bbd750cdc;hb=79367306ff599b8f8f2cc76996e67e34e49ec97f;hp=9dc50a430245df100cbd7a693771a63b8155d6f3;hpb=392885c1a8d50369708bbe5e6b44033ed8b8ba51;p=modules%2Fgeom.git

diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am
index 9dc50a430..54f6e94fb 100644
--- a/src/GEOMGUI/Makefile.am
+++ b/src/GEOMGUI/Makefile.am
@@ -1,24 +1,22 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  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 GEOMGUI : GUI for Geometry component
 # File    : Makefile.am
 # Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
@@ -32,13 +30,13 @@ lib_LTLIBRARIES = libGEOM.la
 # header files 
 salomeinclude_HEADERS = 	\
 	GeometryGUI.h		\
+	GeometryGUI_Operations.h\
 	GEOMGUI.h		\
 	GEOM_Displayer.h	\
 	GEOMGUI_OCCSelector.h	\
 	GEOMGUI_Selection.h	\
-	GeometryGUI_Swig.hxx	\
-	GeometryGUI_Swig.i	\
-	GEOM_GEOMGUI.hxx
+	GEOM_GEOMGUI.hxx	\
+	GEOMGUI_CreationInfoWdg.h
 
 dist_libGEOM_la_SOURCES =	\
 	GeometryGUI.cxx		\
@@ -46,9 +44,10 @@ dist_libGEOM_la_SOURCES =	\
 	GEOM_Displayer.cxx	\
         GEOMGUI_OCCSelector.cxx	\
 	GEOMGUI_Selection.cxx	\
-	GeometryGUI_Swig.cxx
+	GEOMGUI_CreationInfoWdg.cxx
 
 MOC_FILES =			\
+	GEOMGUI_CreationInfoWdg_moc.cxx \
 	GeometryGUI_moc.cxx
 
 nodist_libGEOM_la_SOURCES =	\
@@ -58,7 +57,8 @@ nodist_libGEOM_la_SOURCES =	\
 nodist_salomeres_DATA =	\
 	GEOM_images.qm	\
 	GEOM_msg_en.qm	\
-	GEOM_msg_fr.qm
+	GEOM_msg_fr.qm  \
+	GEOM_msg_ja.qm
 
 # additional information to compile and link file
 
@@ -72,19 +72,25 @@ libGEOM_la_CPPFLAGS =				\
 	$(GUI_CXXFLAGS)				\
 	$(CORBA_CXXFLAGS)			\
 	$(CORBA_INCLUDES)			\
+	$(OPENCV_INCLUDES)			\
 	-I$(srcdir)/../OBJECT			\
 	-I$(srcdir)/../GEOMFiltersSelection	\
+	-I$(srcdir)/../Material			\
 	-I$(srcdir)/../GEOMClient		\
 	-I$(srcdir)/../GEOMImpl			\
 	-I$(top_builddir)/idl			\
-	-I$(top_builddir)/salome_adm/unix
+	-I$(top_builddir)
 
 libGEOM_la_LDFLAGS =						\
+	$(PYTHON_LIBS)						\
 	../GEOMFiltersSelection/libGEOMFiltersSelection.la	\
+	../Material/libMaterial.la				\
 	../GEOMClient/libGEOMClient.la				\
 	../OBJECT/libGEOMObject.la				\
-	$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA		\
-	$(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent
+	$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient		\
+	$(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd	\
+	$(OPENCV_LIBS)
+
 # -lSalomeApp 
 # -lToolsGUI
 #	$(CORBA_LIBS) \