From 1e9ae4b922bc09ba5954a7817dfb963a4ba90a3d Mon Sep 17 00:00:00 2001
From: Antoine Villeret <avilleret@users.sourceforge.net>
Date: Sat, 22 Sep 2012 15:11:33 +0000
Subject: fix Makefile.in

svn path=/trunk/externals/pix_opencv/; revision=16267
---
 Makefile    | 4 +---
 Makefile.in | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a48b92b..fd46c16 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,7 @@ ifeq ($(UNAME),Linux)
  LIBS = `pkg-config --libs opencv`
  EXTENSION = pd_linux
  SOURCES_OPT = 
- #~ OPENCV_VERSION = `pkg-config --modversion opencv`
- OPENCV_VERSION = 2.3.0
+ OPENCV_VERSION = `pkg-config --modversion opencv`
 endif
 ifeq ($(UNAME),Darwin)
  INCLUDES += -I/Library/Frameworks/OpenCV.framework/Headers/ -I/Applications/Pd-extended.app/Contents/Resources/include/pdextended -I/Applications/Pd-extended.app/Contents/Resources/include/
@@ -57,7 +56,6 @@ distro: clean all
 	rm *.o
 	
 blobtrack:
-ifeq ( $(OPENCV_VERSION), 2.*.*)
 	g++ $(CPPFLAGS) $(INCLUDES) -o pix_opencv_blobtrack.o -c pix_opencv_blobtrack.cpp
 	g++ $(LDFLAGS) -o pix_opencv_blobtrack.$(EXTENSION) pix_opencv_blobtrack.o $(LIBS)
 	rm pix_opencv_blobtrack.o
diff --git a/Makefile.in b/Makefile.in
index d2ee7d3..d569bab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,6 @@ distro: clean all
 	rm *.o
 	
 blobtrack:
-ifeq ( $(OPENCV_VERSION), 2.*)
 	g++ $(CPPFLAGS) $(INCLUDES) -o pix_opencv_blobtrack.o -c pix_opencv_blobtrack.cpp
 	g++ $(LDFLAGS) -o pix_opencv_blobtrack.$(EXTENSION) pix_opencv_blobtrack.o $(LIBS)
 	rm pix_opencv_blobtrack.o
-- 
cgit v1.2.1