[openrtm-commit:00048] r18 - in trunk/ImageProcessing/opencv: . components components/Affine components/BackGroundSubtractionSimple components/Binarization components/CameraViewer components/Chromakey components/Dilationerosion components/Edge components/Findcontour components/Flip components/Histogram components/Houghline components/ImageCalibration components/ImageSubstraction components/ObjectTracking components/OpenCVCamera components/PGRCamera components/Perspective components/RockPaperScissors components/Rotate components/Scale components/Sepia components/SubStractCaptureImage components/Template components/Translate
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 5月 12日 (木) 14:01:49 JST
Author: kurihara
Date: 2011-05-12 14:01:49 +0900 (Thu, 12 May 2011)
New Revision: 18
Modified:
trunk/ImageProcessing/opencv/Makefile.am
trunk/ImageProcessing/opencv/components/Affine/Makefile.am
trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/Makefile.am
trunk/ImageProcessing/opencv/components/Binarization/Makefile.am
trunk/ImageProcessing/opencv/components/CameraViewer/Makefile.am
trunk/ImageProcessing/opencv/components/Chromakey/Makefile.am
trunk/ImageProcessing/opencv/components/Dilationerosion/Makefile.am
trunk/ImageProcessing/opencv/components/Edge/Makefile.am
trunk/ImageProcessing/opencv/components/Findcontour/Makefile.am
trunk/ImageProcessing/opencv/components/Flip/Makefile.am
trunk/ImageProcessing/opencv/components/Histogram/Makefile.am
trunk/ImageProcessing/opencv/components/Houghline/Makefile.am
trunk/ImageProcessing/opencv/components/ImageCalibration/Makefile.am
trunk/ImageProcessing/opencv/components/ImageSubstraction/Makefile.am
trunk/ImageProcessing/opencv/components/Makefile.am
trunk/ImageProcessing/opencv/components/ObjectTracking/Makefile.am
trunk/ImageProcessing/opencv/components/OpenCVCamera/Makefile.am
trunk/ImageProcessing/opencv/components/PGRCamera/Makefile.am
trunk/ImageProcessing/opencv/components/PGRCamera/PGRCamera.h
trunk/ImageProcessing/opencv/components/Perspective/Makefile.am
trunk/ImageProcessing/opencv/components/RockPaperScissors/Makefile.am
trunk/ImageProcessing/opencv/components/Rotate/Makefile.am
trunk/ImageProcessing/opencv/components/Scale/Makefile.am
trunk/ImageProcessing/opencv/components/Sepia/Makefile.am
trunk/ImageProcessing/opencv/components/SubStractCaptureImage/Makefile.am
trunk/ImageProcessing/opencv/components/Template/Makefile.am
trunk/ImageProcessing/opencv/components/Translate/Makefile.am
trunk/ImageProcessing/opencv/configure.ac
Log:
Some problems about Makefile.am were revised.
Modified: trunk/ImageProcessing/opencv/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,4 +2,4 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = rtm components
+SUBDIRS = components
Modified: trunk/ImageProcessing/opencv/components/Affine/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Affine/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Affine/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -5,8 +5,8 @@
IDLC = @IDLC@
IDLFLAGS = @IDL_FLAGS@
LIBS = @LIBS@
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/BackGroundSubtractionSimple/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Binarization/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Binarization/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Binarization/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/CameraViewer/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/CameraViewer/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/CameraViewer/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Chromakey/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Chromakey/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Chromakey/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Dilationerosion/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Dilationerosion/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Dilationerosion/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Edge/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Edge/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Edge/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Findcontour/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Findcontour/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Findcontour/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Flip/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Flip/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Flip/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Histogram/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Histogram/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Histogram/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Houghline/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Houghline/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Houghline/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/ImageCalibration/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageCalibration/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/ImageCalibration/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/ImageSubstraction/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/ImageSubstraction/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/ImageSubstraction/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,4 +2,4 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = Affine BackGroundSubtractionSimple Binarization Chromakey Dilationerosion Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction ObjectTracking PGRCamera Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template Translate OpenCVCamera CameraViewer
+SUBDIRS = Affine BackGroundSubtractionSimple Binarization Chromakey Dilationerosion Edge Findcontour Flip Histogram Houghline ImageCalibration ImageSubstraction ObjectTracking Perspective RockPaperScissors Rotate Scale Sepia SubStractCaptureImage Template Translate OpenCVCamera CameraViewer
Modified: trunk/ImageProcessing/opencv/components/ObjectTracking/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/ObjectTracking/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/ObjectTracking/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/OpenCVCamera/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/OpenCVCamera/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/OpenCVCamera/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/PGRCamera/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl -I/usr/include/flycapture
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel -lflycapture${D}
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/PGRCamera/PGRCamera.h
===================================================================
--- trunk/ImageProcessing/opencv/components/PGRCamera/PGRCamera.h 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/PGRCamera/PGRCamera.h 2011-05-12 05:01:49 UTC (rev 18)
@@ -18,9 +18,9 @@
#include <rtm/idl/BasicDataTypeSkel.h>
#include <rtm/idl/InterfaceDataTypesSkel.h>
-#include "Camera.h"
-#include "FlyCapture2.h"
-#include "FlyCapture2GUI.h"
+//#include "Camera.h"
+//#include "FlyCapture2.h"
+//#include "FlyCapture2GUI.h"
#include <cv.h>
#include <cxcore.h>
Modified: trunk/ImageProcessing/opencv/components/Perspective/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Perspective/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Perspective/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/RockPaperScissors/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/RockPaperScissors/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/RockPaperScissors/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
@@ -17,7 +17,7 @@
# Loadable RTCs
socomp_LTLIBRARIES = RockPaperScissors.la
-RockPaperScissors_la_SOURCES = RockPaperScissors.cpp RockPaperScissors.h
+RockPaperScissors_la_SOURCES = RockPaperScissors.cpp RockPaperScissors.h Labeling.h LabellingW.h
RockPaperScissors_la_LDFLAGS = -module
# Standalone RTCs
@@ -39,7 +39,9 @@
Makefile.RockPaperScissors \
README.RockPaperScissors
-ALL_SRC = \
+ALL_SRC = \
+ Labeling.h \
+ LabellingW.h \
RockPaperScissorsComp.cpp \
RockPaperScissors.cpp \
RockPaperScissors.h
Modified: trunk/ImageProcessing/opencv/components/Rotate/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Rotate/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Rotate/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Scale/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Scale/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Scale/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Sepia/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Sepia/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Sepia/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/SubStractCaptureImage/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/SubStractCaptureImage/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/SubStractCaptureImage/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Template/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Template/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Template/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/components/Translate/Makefile.am
===================================================================
--- trunk/ImageProcessing/opencv/components/Translate/Makefile.am 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/components/Translate/Makefile.am 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,8 +2,8 @@
AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv` -I$(top_srcdir)/rtm/idl
-AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv` -L$(top_srcdir)/rtm/idl -lRTCSkel
+AM_CPPFLAGS=`rtm-config --cflags` `pkg-config --cflags opencv`
+AM_LDFLAGS=-`rtm-config --libs` `pkg-config --libs opencv`
#------------------------------------------------------------
# Targets
Modified: trunk/ImageProcessing/opencv/configure.ac
===================================================================
--- trunk/ImageProcessing/opencv/configure.ac 2011-05-06 06:09:46 UTC (rev 17)
+++ trunk/ImageProcessing/opencv/configure.ac 2011-05-12 05:01:49 UTC (rev 18)
@@ -2,10 +2,10 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.61])
-AC_INIT(OpenCV, 0.0.1, Noriaki Ando)
+AC_INIT(OpenCVRTC, 1.0.0, Noriaki Ando)
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE(OpenCV, 0.0.1)
+AM_INIT_AUTOMAKE(OpenCVRTC, 1.0.0)
# Checks for programs.
@@ -1376,7 +1376,6 @@
components/ImageCalibration/Makefile
components/ImageSubstraction/Makefile
components/ObjectTracking/Makefile
- components/PGRCamera/Makefile
components/Perspective/Makefile
components/RockPaperScissors/Makefile
components/Rotate/Makefile
@@ -1387,7 +1386,5 @@
components/Translate/Makefile
components/OpenCVCamera/Makefile
components/CameraViewer/Makefile
- rtm/Makefile
- rtm/idl/Makefile
])
openrtm-commit メーリングリストの案内