diff --git a/Makefile b/Makefile index 5bd191337bc52f6f9b2c5ca24295a41c3f886d86..94ec6dcd7058b32a727f8e6300c6917f186dba6f 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,6 @@ SUBDIR+= hyper SUBDIR+= hyper_genom SUBDIR+= jafar-lgl SUBDIR+= jafar-rednav -SUBDIR+= jafar-correl SUBDIR+= jafar-qdisplay SUBDIR+= jafar-gdhe SUBDIR+= jafar-rtslam diff --git a/jafar-correl/DESCR b/jafar-correl/DESCR deleted file mode 100644 index e37dd015264f2cb97c1133f9247d9e4d6d2951d8..0000000000000000000000000000000000000000 --- a/jafar-correl/DESCR +++ /dev/null @@ -1 +0,0 @@ -Jafar module with image correlation functions diff --git a/jafar-correl/Makefile b/jafar-correl/Makefile deleted file mode 100644 index 54cab90f898f1b58aae5f6a47dba0562449ab1f6..0000000000000000000000000000000000000000 --- a/jafar-correl/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -VERSION= 0.1 -DISTNAME= jafar-correl-0.1 -PKGNAME= jafar-correl-0.1 -CATEGORIES= wip -MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=jafar-correl/} -MAINTAINER= jafar@laas.fr -HOMEPAGE= https://intranet.laas.fr/intranet/robots/wiki/Jafar -COMMENT= Jafar module with image correlation functions -LICENSE= isc - -USE_LANGUAGES+= c c++ fortran -USE_PKGLOCALEDIR= yes - -CPPFLAGS += -DJFR_NDEBUG -CXXFLAGS += -pthread - -CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include -CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include - -include ../../devel/jafar-kernel/depend.mk -include ../../image/jafar-image/depend.mk -include ../../math/jafar-jmath/depend.mk -include ../../image/opencv/depend.mk - -include ../../pkgtools/libtool/depend.mk -include ../../pkgtools/pkg-config/depend.mk -include ../../mk/sysdep/cmake.mk -include ../../mk/robotpkg.mk diff --git a/jafar-correl/PLIST b/jafar-correl/PLIST deleted file mode 100644 index 245987aeacd170c1f8cab4500e0b240af8fc32c1..0000000000000000000000000000000000000000 --- a/jafar-correl/PLIST +++ /dev/null @@ -1,13 +0,0 @@ -@comment Wed Jun 15 20:01:32 CEST 2011 -include/jafar/correl/correlException.hpp -include/jafar/correl/explorer.hpp -include/jafar/correl/explorer.hpp~ -include/jafar/correl/zncc.hpp -include/jafar/correl/zncc.hpp~ -lib/libjafar-correl.so -lib/libjafar-correl.so.${PKGVERSION} -lib/libjafar-correl.so.0 -lib/pkgconfig/jafar-correl.pc -share/cmake/jafar/correl-headers.cmake -share/cmake/jafar/correl-release.cmake -share/cmake/jafar/correl.cmake diff --git a/jafar-correl/depend.mk b/jafar-correl/depend.mk deleted file mode 100644 index 2d37e7675ba1611f4103515426b6698e4d086a83..0000000000000000000000000000000000000000 --- a/jafar-correl/depend.mk +++ /dev/null @@ -1,23 +0,0 @@ - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -jafar-correl_DEPEND_MK:= ${jafar-correl_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= jafar-correl -endif - -ifeq (+,$(jafar-correl_DEPEND_MK)) # ----------------------------------------------- - -PREFER.jafar-correl?= robotpkg - -DEPEND_USE+= jafar-correl -DEPEND_ABI.jafar-correl?= jafar-correl>=0.1 -DEPEND_DIR.jafar-correl?= ../../wip/jafar-correl - -SYSTEM_SEARCH.jafar-correl=\ - include/jafar/correl/correlException.hpp \ - lib/libjafar-correl.so - -endif # jafar-correl_DEPEND_MK ---------------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/jafar-correl/distinfo b/jafar-correl/distinfo deleted file mode 100644 index ac38d67baaa38a31c460e4df5d15093c6521ea8c..0000000000000000000000000000000000000000 --- a/jafar-correl/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -SHA1 (jafar-correl-0.1.tar.gz) = 47070004fc509129816893a9c47d18294857f5fa -RMD160 (jafar-correl-0.1.tar.gz) = 7d633eac7bde96cab0bfee5cd66fabef8b862918 -Size (jafar-correl-0.1.tar.gz) = 46470 bytes diff --git a/jafar-rtslam/Makefile b/jafar-rtslam/Makefile index a3c0f9a08df9d758e3be3d9c14e3ea6cf0ecd556..484d71e06a8a3cacecf3720fef5e92e2f0503797 100644 --- a/jafar-rtslam/Makefile +++ b/jafar-rtslam/Makefile @@ -58,7 +58,7 @@ CPPFLAGS+= -DHAVE_MODULE_GDHE DEPEND_ABI.MTI= MTI>=0.5 -include ../../wip/jafar-correl/depend.mk +include ../../image/jafar-correl/depend.mk include ../../wip/jafar-gdhe/depend.mk include ../../image/jafar-image/depend.mk include ../../math/jafar-jmath/depend.mk