Add preliminary OMK support for color-finder compilation

TODO: Modify OMK to support .cpp extension.

diff --git a/src/camera/color-finder/common/CRawImage.o b/src/camera/color-finder/common/CRawImage.o
deleted file mode 100644 (file)
index 28a98c6..0000000
Binary files a/src/camera/color-finder/common/CRawImage.o and /dev/null differ

diff --git a/src/camera/color-finder/common/Makefile b/src/camera/color-finder/common/Makefile
index 401c829e86f2ca6e0b82cf5d556f8fd959c4e797..08cf5ff32b1af596bdbbf00ceb090c934e395c71 100644 (file)
--- a/src/camera/color-finder/common/Makefile
+++ b/src/camera/color-finder/common/Makefile
@@ -1,15 +1,14 @@
-OBJS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+# Generic directory or leaf node makefile for OCERA make framework
 
-include ../Mk/local.Mk
-CXXINCLUDE+=-I./ 
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
 
-all: $(OBJS)
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else   
+include $(MAKERULES_DIR)/Makefile.rules
+endif
 
-.cpp.o:
-       $(CXX)  $(CXXFLAGS) $(CXXDEFINE) -c  $(CXXINCLUDE) $< 
-
-.c.o:
-       $(CXX)  $(FLAGS) $(CXXDEFINE) -c  $(CXXFLAGS) $(CXXINCLUDE) $< 
-
-clean:
-       $(RM) $(OBJS)

diff --git a/src/camera/color-finder/common/Makefile.omk b/src/camera/color-finder/common/Makefile.omk
new file mode 100644 (file)
index 0000000..75a73c7
--- /dev/null
+++ b/src/camera/color-finder/common/Makefile.omk
@@ -0,0 +1,4 @@
+lib_LIBRARIES = color-finder-common
+
+color-finder-common_SOURCES = CRawImage.cpp CThread.cpp CTimer.cpp cmath.cpp
+include_HEADERS = CRawImage.h CThread.h CThread.h CTimer.h cmath.h

diff --git a/src/camera/color-finder/common/Makefile.std b/src/camera/color-finder/common/Makefile.std
new file mode 100644 (file)
index 0000000..401c829
--- /dev/null
+++ b/src/camera/color-finder/common/Makefile.std
@@ -0,0 +1,15 @@
+OBJS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+
+include ../Mk/local.Mk
+CXXINCLUDE+=-I./ 
+
+all: $(OBJS)
+
+.cpp.o:
+       $(CXX)  $(CXXFLAGS) $(CXXDEFINE) -c  $(CXXINCLUDE) $< 
+
+.c.o:
+       $(CXX)  $(FLAGS) $(CXXDEFINE) -c  $(CXXFLAGS) $(CXXINCLUDE) $< 
+
+clean:
+       $(RM) $(OBJS)

diff --git a/src/camera/color-finder/main/Makefile b/src/camera/color-finder/main/Makefile
index c7cbf34ce985d48997a547470b244788ac4ea4c8..08cf5ff32b1af596bdbbf00ceb090c934e395c71 100644 (file)
--- a/src/camera/color-finder/main/Makefile
+++ b/src/camera/color-finder/main/Makefile
@@ -1,16 +1,14 @@
-OBJS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+# Generic directory or leaf node makefile for OCERA make framework
 
-include ../Mk/local.Mk
-CXXINCLUDE+=-I./ -I../common -I../camera -I../gui -I../control
-CXXINCLUDE+=-I/usr/local/include
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
 
-all: $(OBJS) 
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else   
+include $(MAKERULES_DIR)/Makefile.rules
+endif
 
-.cpp.o:
-       $(CXX)  $(CXXFLAGS) $(CXXDEFINE) -c  $(CXXINCLUDE) $< 
-
-.c.o:
-       $(CXX)  $(FLAGS) $(CXXDEFINE) -c  $(CXXFLAGS) $(CXXINCLUDE) $< 
-
-clean:
-       $(RM) $(OBJS) *.moc $(UI_HEAD) $(UI_CPP)

diff --git a/src/camera/color-finder/main/Makefile.omk b/src/camera/color-finder/main/Makefile.omk
new file mode 100644 (file)
index 0000000..c21d340
--- /dev/null
+++ b/src/camera/color-finder/main/Makefile.omk
@@ -0,0 +1,4 @@
+bin_PROGRAMS = revue
+
+revue_SOURCES = revue.cpp
+revue_LIBS = color-finder-common

diff --git a/src/camera/color-finder/main/Makefile.std b/src/camera/color-finder/main/Makefile.std
new file mode 100644 (file)
index 0000000..c7cbf34
--- /dev/null
+++ b/src/camera/color-finder/main/Makefile.std
@@ -0,0 +1,16 @@
+OBJS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
+
+include ../Mk/local.Mk
+CXXINCLUDE+=-I./ -I../common -I../camera -I../gui -I../control
+CXXINCLUDE+=-I/usr/local/include
+
+all: $(OBJS) 
+
+.cpp.o:
+       $(CXX)  $(CXXFLAGS) $(CXXDEFINE) -c  $(CXXINCLUDE) $< 
+
+.c.o:
+       $(CXX)  $(FLAGS) $(CXXDEFINE) -c  $(CXXFLAGS) $(CXXINCLUDE) $< 
+
+clean:
+       $(RM) $(OBJS) *.moc $(UI_HEAD) $(UI_CPP)