Merge branch 'maint-demo'

diff --git a/src/camera/barcam/Makefile.omk b/src/camera/barcam/Makefile.omk
index 50cee6c9fc4c513ecada76cff86bdfd1d5db6ed0..d7522515dd2da68ab9514fb7701622e245d47f05 100644 (file)
--- 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

diff --git a/src/camera/rozkuk/Makefile.omk b/src/camera/rozkuk/Makefile.omk
index 8d4a03d7d9d83ca263e85e7b08dc57959cee901a..45296679f9cada355e847c97197d0534b7060b10 100644 (file)
--- a/src/camera/rozkuk/Makefile.omk
+++ b/src/camera/rozkuk/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
@@ -33,3 +37,5 @@ masks.stamp: bmasks.stamp ymasks.stamp
 #      $(OUTPUT_DIR)/_compiled/bin/clr2float_conv mask*.png
        touch $@
 endif
+
+endif

diff --git a/src/hokuyo/Makefile.omk b/src/hokuyo/Makefile.omk
index 0805e203b04e50d4e28249c22d7e67553d363567..6a272a18601fca755645a827289ff1b32305c205 100644 (file)
--- a/src/hokuyo/Makefile.omk
+++ b/src/hokuyo/Makefile.omk
@@ -7,7 +7,7 @@ hokuyo-dump_SOURCES = hokuyo-dump.c
 
 include_HEADERS = hokuyo.h
 
-lib_LOADLIBES = pthread roboorte robottype orte urg m rt
+lib_LOADLIBES = roboorte robottype orte urg m rt pthread
 
 SUBDIRS=lib shape-detect
 

diff --git a/src/orte b/src/orte
index 070fc7455b518aece753bd59c364bc7f2a861e1a..8ae3dd775fed3a4844780ff1f13515bbc97d54cf 160000 (submodule)
--- a/src/orte
+++ b/src/orte
@@ -1 +1 @@
-Subproject commit 070fc7455b518aece753bd59c364bc7f2a861e1a
+Subproject commit 8ae3dd775fed3a4844780ff1f13515bbc97d54cf