ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-05-10 18:30:48 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gdd 2011-09-13 14:47:24 +00:00
parent 5019051f01
commit 6b2b54b76d
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BasicGUI/Makefile.am
View File

@ -93,6 +93,7 @@ libBasicGUI_la_CPPFLAGS = \
$(GUI_CXXFLAGS) \ $(GUI_CXXFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
$(OPENCV_INCLUDES) \
-I$(srcdir)/../OBJECT \ -I$(srcdir)/../OBJECT \
-I$(srcdir)/../DlgRef \ -I$(srcdir)/../DlgRef \
-I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../GEOMGUI \
@ -101,9 +102,7 @@ libBasicGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMClient \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl \ -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
libBasicGUI_la_LDFLAGS = \ libBasicGUI_la_LDFLAGS = \
@ -112,4 +111,4 @@ libBasicGUI_la_LDFLAGS = \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
$(CAS_LDFLAGS) -lTKGeomBase \ $(CAS_LDFLAGS) -lTKGeomBase \
$(GUI_LDFLAGS) -lsuit \ $(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)

8
src/GEOMBase/Makefile.am
View File

@ -61,15 +61,14 @@ libGEOMBase_la_CPPFLAGS = \
$(GUI_CXXFLAGS) \ $(GUI_CXXFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
$(OPENCV_INCLUDES) \
-I$(srcdir)/../OBJECT \ -I$(srcdir)/../OBJECT \
-I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMClient \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../GEOMGUI \
-I$(srcdir)/../DlgRef \ -I$(srcdir)/../DlgRef \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl \ -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
libGEOMBase_la_LDFLAGS = \ libGEOMBase_la_LDFLAGS = \
../../idl/libSalomeIDLGEOM.la \ ../../idl/libSalomeIDLGEOM.la \
@ -78,5 +77,4 @@ libGEOMBase_la_LDFLAGS = \
$(KERNEL_LDFLAGS) -lOpUtil \ $(KERNEL_LDFLAGS) -lOpUtil \
$(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \ $(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \
$(CAS_LDPATH) -lTKPrim \ $(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)

7
src/GEOMGUI/Makefile.am
View File

@ -71,14 +71,13 @@ libGEOM_la_CPPFLAGS = \
$(GUI_CXXFLAGS) \ $(GUI_CXXFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
$(OPENCV_INCLUDES) \
-I$(srcdir)/../OBJECT \ -I$(srcdir)/../OBJECT \
-I$(srcdir)/../GEOMFiltersSelection \ -I$(srcdir)/../GEOMFiltersSelection \
-I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMClient \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \
-I$(top_builddir) \ -I$(top_builddir)
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include
libGEOM_la_LDFLAGS = \ libGEOM_la_LDFLAGS = \
$(PYTHON_LIBS) \ $(PYTHON_LIBS) \
@ -87,7 +86,7 @@ libGEOM_la_LDFLAGS = \
../OBJECT/libGEOMObject.la \ ../OBJECT/libGEOMObject.la \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient \
$(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd \ $(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 # -lSalomeApp
# -lToolsGUI # -lToolsGUI

8
src/OperationGUI/Makefile.am
View File

@ -73,6 +73,7 @@ libOperationGUI_la_CPPFLAGS = \
$(GUI_CXXFLAGS) \ $(GUI_CXXFLAGS) \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
$(OPENCV_INCLUDES) \
-I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../GEOMGUI \
-I$(srcdir)/../DlgRef \ -I$(srcdir)/../DlgRef \
-I$(srcdir)/../GEOMBase \ -I$(srcdir)/../GEOMBase \
@ -81,16 +82,13 @@ libOperationGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMAlgo \ -I$(srcdir)/../GEOMAlgo \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl \ -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
libOperationGUI_la_LDFLAGS = \ libOperationGUI_la_LDFLAGS = \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
$(CAS_LDPATH) -lTKFillet \ $(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 ? # Obsolete files ?
############################### ###############################