From 6b2b54b76d2b85e94b368ceab7c4e17d815b32d7 Mon Sep 17 00:00:00 2001 From: gdd Date: Tue, 13 Sep 2011 14:47:24 +0000 Subject: [PATCH] rnc : removed "hard-written" paths from all Makefile.am files --- src/BasicGUI/Makefile.am | 7 +++---- src/GEOMBase/Makefile.am | 8 +++----- src/GEOMGUI/Makefile.am | 7 +++---- src/OperationGUI/Makefile.am | 8 +++----- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am index 05ba2d561..5aad443b1 100644 --- a/src/BasicGUI/Makefile.am +++ b/src/BasicGUI/Makefile.am @@ -93,6 +93,7 @@ libBasicGUI_la_CPPFLAGS = \ $(GUI_CXXFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ + $(OPENCV_INCLUDES) \ -I$(srcdir)/../OBJECT \ -I$(srcdir)/../DlgRef \ -I$(srcdir)/../GEOMGUI \ @@ -101,9 +102,7 @@ libBasicGUI_la_CPPFLAGS = \ -I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMClient \ -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl \ - -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \ - -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include + -I$(top_builddir)/idl libBasicGUI_la_LDFLAGS = \ @@ -112,4 +111,4 @@ libBasicGUI_la_LDFLAGS = \ ../GEOMGUI/libGEOM.la \ $(CAS_LDFLAGS) -lTKGeomBase \ $(GUI_LDFLAGS) -lsuit \ - -L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann + $(OPENCV_LIBS) diff --git a/src/GEOMBase/Makefile.am b/src/GEOMBase/Makefile.am index 70ead1485..77d1624c3 100644 --- a/src/GEOMBase/Makefile.am +++ b/src/GEOMBase/Makefile.am @@ -61,15 +61,14 @@ libGEOMBase_la_CPPFLAGS = \ $(GUI_CXXFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ + $(OPENCV_INCLUDES) \ -I$(srcdir)/../OBJECT \ -I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../DlgRef \ -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl \ - -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \ - -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include + -I$(top_builddir)/idl libGEOMBase_la_LDFLAGS = \ ../../idl/libSalomeIDLGEOM.la \ @@ -78,5 +77,4 @@ libGEOMBase_la_LDFLAGS = \ $(KERNEL_LDFLAGS) -lOpUtil \ $(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \ $(CAS_LDPATH) -lTKPrim \ - -L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann - + $(OPENCV_LIBS) diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am index 305b4e856..bfd12147f 100644 --- a/src/GEOMGUI/Makefile.am +++ b/src/GEOMGUI/Makefile.am @@ -71,14 +71,13 @@ libGEOM_la_CPPFLAGS = \ $(GUI_CXXFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ + $(OPENCV_INCLUDES) \ -I$(srcdir)/../OBJECT \ -I$(srcdir)/../GEOMFiltersSelection \ -I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMImpl \ -I$(top_builddir)/idl \ - -I$(top_builddir) \ - -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \ - -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include + -I$(top_builddir) libGEOM_la_LDFLAGS = \ $(PYTHON_LIBS) \ @@ -87,7 +86,7 @@ libGEOM_la_LDFLAGS = \ ../OBJECT/libGEOMObject.la \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient \ $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd \ - -L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann + $(OPENCV_LIBS) # -lSalomeApp # -lToolsGUI diff --git a/src/OperationGUI/Makefile.am b/src/OperationGUI/Makefile.am index 31a562122..e5f3a27d8 100644 --- a/src/OperationGUI/Makefile.am +++ b/src/OperationGUI/Makefile.am @@ -73,6 +73,7 @@ libOperationGUI_la_CPPFLAGS = \ $(GUI_CXXFLAGS) \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ + $(OPENCV_INCLUDES) \ -I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../DlgRef \ -I$(srcdir)/../GEOMBase \ @@ -81,16 +82,13 @@ libOperationGUI_la_CPPFLAGS = \ -I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMAlgo \ -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl \ - -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \ - -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include + -I$(top_builddir)/idl libOperationGUI_la_LDFLAGS = \ ../GEOMBase/libGEOMBase.la \ $(CAS_LDPATH) -lTKFillet \ - -L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann - + $(OPENCV_LIBS) ############################### # Obsolete files ? ############################### -- 2.39.2