[Robotflow-cvs] RobotFlow/Vision/src Makefile.am,1.28,1.29

[Dominic L. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Vision/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv376/Vision/src

Modified Files:
	Makefile.am 
Log Message:
added detection of OpenCV


Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Vision/src/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile.am	6 Aug 2004 13:32:30 -0000	1.28
--- Makefile.am	12 Apr 2005 19:23:04 -0000	1.29
***************
*** 6,9 ****
--- 6,15 ----
  lib_LTLIBRARIES = libVision.la
  
+ if WITH_OPENCV
+ OPENCV_SOURCES = 
+ else
+ OPENCV_SOURCES =
+ endif
+ 
  # Sources for compilation in the library
  libVision_la_SOURCES = BMPLoad.cc \
***************
*** 61,72 ****
  	Scale.cc \
  	ScalePrint.cc \
! 	RGB242RGB15.cc
  
  
  
  
! libVision_la_LDFLAGS = -release $(LT_RELEASE) $(PIXBUF_LIBS) $(GNOME_LIB) $(JPEG_LIB)
  
! INCLUDES = -I../include $(OVERFLOW_INCLUDE) $(PIXBUF_INCLUDE) $(JPEG_INCLUDE)
  
  install-data-local:
--- 67,78 ----
  	Scale.cc \
  	ScalePrint.cc \
! 	RGB242RGB15.cc $(OPENCV_SOURCES)
  
  
  
  
! libVision_la_LDFLAGS = -release $(LT_RELEASE) $(PIXBUF_LIBS) $(GNOME_LIB) $(JPEG_LIB) $(OPENCV_LIBS)
  
! INCLUDES = -I../include $(OVERFLOW_INCLUDE) $(PIXBUF_INCLUDE) $(JPEG_INCLUDE) $(OPENCV_INCLUDES)
  
  install-data-local: