rnc : removed "hard-written" paths from all Makefile.am files

diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am
index 05ba2d5618686ede49de1da7ed8215daf4f74137..5aad443b1b8e00fc756b1e00df75c9ad0eed4c8b 100644 (file)
--- 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 70ead1485b5a5a199ac266ce50264717229f5968..77d1624c31d47a1f4c1baaf9489b281f489f064b 100644 (file)
--- 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 305b4e85618c6b8ad34943d9eb65a6446b369cbe..bfd12147f143d3a463a75165023f784c8aab8d38 100644 (file)
--- 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 31a5621226d7c06499677ee67081371d5602b3f5..e5f3a27d8a3c6e64f53c1287f13a95120f944aca 100644 (file)
--- 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 ?
 ###############################