From: Michal Sojka Date: Thu, 24 Oct 2013 05:16:05 +0000 (+0200) Subject: Make compilation of barcol and barcam conditional X-Git-Url: http://rtime.felk.cvut.cz/gitweb/eurobot/public.git/commitdiff_plain/89c177f5d3170f9fcabbb28b670b7106c42ef65e Make compilation of barcol and barcam conditional These programs depend on an old version of OpenCV, which is no longer available in current Linux distributions. Conflicts: src/camera/barcam/Makefile.omk src/camera/barcol/Makefile.omk --- diff --git a/src/camera/barcam/Makefile.omk b/src/camera/barcam/Makefile.omk index 50cee6c9..d7522515 100644 --- a/src/camera/barcam/Makefile.omk +++ b/src/camera/barcam/Makefile.omk @@ -1,5 +1,9 @@ # -*- makefile -*- +default_CONFIG = CONFIG_BARCAM=y + +ifeq ($(CONFIG_BARCAM),y) + # If OpenCV is installed in /usr/local INCLUDES += -I /usr/local/include LDFLAGS += -L /usr/local/lib @@ -9,4 +13,6 @@ bin_PROGRAMS = barcam #v4l-info #v4l-info_SOURCES = v4l-info.c struct-dump.c struct-v4l.c struct-v4l2.c barcam_SOURCES = barcam.cxx -barcam_LIBS = robodim pthread roboorte robottype orte cv highgui cxcore rt z jpeg fftw3 +barcam_LIBS = robodim pthread roboorte robottype orte cv highgui cxcore rt z jpeg #fftw3 + +endif