diff --git a/Makefile b/Makefile
index e189910b10af26229a6fd47c3c5300a7d020e8f6..e1aa77bfa26dfa5da59873ea82d62f9f083c9569 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ SUBDIR+= demo-genom3
SUBDIR+= dynamic-graph-bridge
SUBDIR+= dynamic-graph-bridge-msgs
SUBDIR+= gdalwrap
-SUBDIR+= genom3
SUBDIR+= genom3-openprs
SUBDIR+= genom3-pocolibs
SUBDIR+= genom3-ros
diff --git a/demo-genom3/Makefile b/demo-genom3/Makefile
index 3d9f1d4f40020f489489bb8b9220187c24e7b36d..e9ad58cf6434020d4b6a4acaa7f2254a30f56602 100644
--- a/demo-genom3/Makefile
+++ b/demo-genom3/Makefile
@@ -12,7 +12,7 @@ MAINTAINER= openrobots@laas.fr
COMMENT= sample GenoM module used in the tutorial
LICENSE= isc
-include ../../wip/genom3/module.mk
+include ../../architecture/genom3/module.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
diff --git a/genom3-openprs/Makefile b/genom3-openprs/Makefile
index b6fa6a9317b0ade666b42d23e058876d06446472..7b3c1d22e663b682129697d0f370282fa2551fdc 100644
--- a/genom3-openprs/Makefile
+++ b/genom3-openprs/Makefile
@@ -23,6 +23,6 @@ AUTORECONF_ARGS= ${WRKSRC}/bootstrap.sh
include ../../wip/transgen3/depend.mk
include ../../pkgtools/pkg-config/depend.mk
-include ../../wip/genom3/depend.mk
+include ../../architecture/genom3/depend.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
diff --git a/genom3-pocolibs/Makefile b/genom3-pocolibs/Makefile
index fdde20d23de723e9a149920b9446d9008c6b02d6..7f16cf2914120adaac4f0b2b3f4294da47c2eb00 100644
--- a/genom3-pocolibs/Makefile
+++ b/genom3-pocolibs/Makefile
@@ -20,6 +20,6 @@ DEPEND_ABI.pocolibs= pocolibs>=2.12
include ../../middleware/pocolibs/depend.mk
include ../../pkgtools/pkg-config/depend.mk
-include ../../wip/genom3/depend.mk
+include ../../architecture/genom3/depend.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
diff --git a/genom3-ros/Makefile b/genom3-ros/Makefile
index 73ddaa6d4416f14d7398b8c3d6b69ef253b19a2a..fe8f08f09ee20b0f40e39145422202315dceb3ad 100644
--- a/genom3-ros/Makefile
+++ b/genom3-ros/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=--with-boost=${PREFIX.boost-headers}
NOT_FOR_PLATFORM= # empty
-include ../../wip/genom3/depend.mk
+include ../../architecture/genom3/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/ros-ros/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
diff --git a/genom3/DESCR b/genom3/DESCR
deleted file mode 100644
index e667d368d6390cbba5f996f67083d39a915fa68b..0000000000000000000000000000000000000000
--- a/genom3/DESCR
+++ /dev/null
@@ -1,31 +0,0 @@
-The Generator of Modules GenoM is a tool to design real-time software
-architectures. It encapsulates software functions inside independent
-components. GenoM is more specifically dedicated to complex on-board systems,
-such as autonomous mobile robots or satellites, that require:
-
-. The integration of heterogeneous functions with different real-time
- constraints and algorithm complexities (control of sensors and actuators,
- data processings, task planification, etc.).
-
-. An homogeneous integration of these functions in a control architecture which
- requires coherent and predictable behaviors (starting, ending, error
- handling), and standard interfaces (configuration, control flow, data
- flow).
-
-. The management of parallelization, physical distribution and portability of
- the functions.
-
-. Simple procedures to add, modify or (re)use the functions by non-specialists
-
-
-GenoM generates the source code of components by using:
-
-. A generic template, common for all components. This guarantees that all
- components share the same consistent behaviour. The template itself is not
- part of GenoM, so that different template kind can be developped easily.
-
-. A formal description of the components interface. This description is based
- on a simple language using OMG IDL for data types definitions and a custom
- syntax for the description of a more detailed component model.
-
-The project is released under an open-source, BSD-like license.
diff --git a/genom3/Makefile b/genom3/Makefile
deleted file mode 100644
index 8d0f7f491a13a956db507dfb0f36fa8520dc2568..0000000000000000000000000000000000000000
--- a/genom3/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# robotpkg Makefile for: architecture/genom3
-# Created: Anthony Mallet on Fri, 19 Oct 2012
-#
-
-VERSION= 2.99.25
-DISTNAME= genom-${VERSION}
-PKGNAME= genom3-${VERSION}
-CATEGORIES= architecture
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=genom/}
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}genom3
-
-MAINTAINER= mallet@laas.fr
-HOMEPAGE= http://www.openrobots.org/wiki/genom3
-COMMENT= Software components generator for robotics architecture.
-
-LICENSE= 2-clause-bsd
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-tcl=$(dir ${TCL_CONFIG_SH})
-CONFIGURE_ARGS+=--with-eltclsh=${PREFIX.eltclsh}
-NOT_FOR_PLATFORM= # empty
-
-DEPEND_ABI.tcl= tcl>=8.5
-
-include ../../pkgtools/pkg-config/depend.mk
-include ../../shell/eltclsh/depend.mk
-include ../../mk/sysdep/bison.mk
-include ../../mk/sysdep/flex.mk
-include ../../mk/sysdep/tcl.mk
-include ../../mk/language/c.mk
-include ../../mk/robotpkg.mk
diff --git a/genom3/PLIST b/genom3/PLIST
deleted file mode 100644
index f6f9cb38075f5f573e16847a69de8bc5e1d25dad..0000000000000000000000000000000000000000
--- a/genom3/PLIST
+++ /dev/null
@@ -1,133 +0,0 @@
-@comment Thu Jul 24 14:18:52 CEST 2014
-bin/genom${PKGVERSION}
-bin/genom3
-include/genom3/c++/event.h
-include/genom3/c++/idloptional.h
-include/genom3/c++/idlsequence.h
-include/genom3/c/client.h
-include/genom3/c/context.h
-include/genom3/c/event.h
-include/genom3/c/exception.h
-include/genom3/c/idlsequence.h
-lib/pkgconfig/genom3-c-client.pc
-lib/pkgconfig/genom3.pc
-libexec/genom-pcpp
-${PKGMANDIR}/man1/genom3.1
-share/doc/genom/CHANGES
-share/doc/genom/COPYING
-share/doc/genom/adoc/copying.adoc
-share/doc/genom/adoc/dotgen/codel.adoc
-share/doc/genom/adoc/dotgen/component.adoc
-share/doc/genom/adoc/dotgen/grammar.adoc
-share/doc/genom/adoc/dotgen/idltype-base.adoc
-share/doc/genom/adoc/dotgen/idltype-constr.adoc
-share/doc/genom/adoc/dotgen/idltype-tmpl.adoc
-share/doc/genom/adoc/dotgen/idltype.adoc
-share/doc/genom/adoc/dotgen/ids.adoc
-share/doc/genom/adoc/dotgen/index.adoc
-share/doc/genom/adoc/dotgen/interface.adoc
-share/doc/genom/adoc/dotgen/keywords.adoc
-share/doc/genom/adoc/dotgen/module.adoc
-share/doc/genom/adoc/dotgen/port.adoc
-share/doc/genom/adoc/dotgen/pragma.adoc
-share/doc/genom/adoc/dotgen/preprocessing.adoc
-share/doc/genom/adoc/dotgen/service.adoc
-share/doc/genom/adoc/dotgen/specification.adoc
-share/doc/genom/adoc/dotgen/task.adoc
-share/doc/genom/adoc/index.adoc
-share/doc/genom/adoc/introduction.adoc
-share/doc/genom/adoc/manual.adoc
-share/doc/genom/adoc/mappings/c++.adoc
-share/doc/genom/adoc/mappings/c.adoc
-share/doc/genom/adoc/mappings/index.adoc
-share/doc/genom/adoc/model/index.adoc
-share/doc/genom/adoc/overview.adoc
-share/doc/genom/adoc/running.adoc
-share/doc/genom/adoc/templates/cmd-dotgen.adoc
-share/doc/genom/adoc/templates/cmd-engine.adoc
-share/doc/genom/adoc/templates/cmd-language.adoc
-share/doc/genom/adoc/templates/cmd-template.adoc
-share/doc/genom/adoc/templates/cmd-type.adoc
-share/doc/genom/adoc/templates/index.adoc
-share/doc/genom/adoc/templates/interactive.adoc
-share/doc/genom/adoc/templates/mappings.adoc
-share/doc/genom/adoc/templates/skeleton.adoc
-share/doc/genom/adoc/templates/tcl-engine.adoc
-share/doc/genom/adoc/tutorials/add-function.adoc
-share/doc/genom/adoc/tutorials/index.adoc
-share/doc/genom/adoc/tutorials/workflow.adoc
-share/doc/genom/html/copying.html
-share/doc/genom/html/dotgen/codel.html
-share/doc/genom/html/dotgen/component.html
-share/doc/genom/html/dotgen/grammar.html
-share/doc/genom/html/dotgen/idltype-base.html
-share/doc/genom/html/dotgen/idltype-constr.html
-share/doc/genom/html/dotgen/idltype-tmpl.html
-share/doc/genom/html/dotgen/idltype.html
-share/doc/genom/html/dotgen/ids.html
-share/doc/genom/html/dotgen/index.html
-share/doc/genom/html/dotgen/interface.html
-share/doc/genom/html/dotgen/keywords.html
-share/doc/genom/html/dotgen/module.html
-share/doc/genom/html/dotgen/port.html
-share/doc/genom/html/dotgen/pragma.html
-share/doc/genom/html/dotgen/preprocessing.html
-share/doc/genom/html/dotgen/service.html
-share/doc/genom/html/dotgen/specification.html
-share/doc/genom/html/dotgen/task.html
-share/doc/genom/html/index.html
-share/doc/genom/html/introduction.html
-share/doc/genom/html/manual.html
-share/doc/genom/html/mappings/c++.html
-share/doc/genom/html/mappings/c.html
-share/doc/genom/html/mappings/index.html
-share/doc/genom/html/model/index.html
-share/doc/genom/html/overview.html
-share/doc/genom/html/running.html
-share/doc/genom/html/templates/cmd-dotgen.html
-share/doc/genom/html/templates/cmd-engine.html
-share/doc/genom/html/templates/cmd-language.html
-share/doc/genom/html/templates/cmd-template.html
-share/doc/genom/html/templates/cmd-type.html
-share/doc/genom/html/templates/index.html
-share/doc/genom/html/templates/interactive.html
-share/doc/genom/html/templates/mappings.html
-share/doc/genom/html/templates/skeleton.html
-share/doc/genom/html/templates/tcl-engine.html
-share/doc/genom/html/tutorials/add-function.html
-share/doc/genom/html/tutorials/index.html
-share/doc/genom/html/tutorials/workflow.html
-share/genom/engines/tcl/engine.la
-share/genom/engines/tcl/engine.tcl
-share/genom/engines/tcl/language-c++.tcl
-share/genom/engines/tcl/language-c.tcl
-share/genom/engines/tcl/language.tcl
-share/genom/engines/tcl/lcs.tcl
-share/genom/engines/tcl/md5.tcl
-share/genom/engines/tcl/merge.tcl
-share/genom/engines/tcl/object.tcl
-share/genom/engines/tcl/pkgIndex.tcl
-share/genom/engines/tcl/template.tcl
-share/genom/engines/tcl/version.tcl
-share/genom/templates/common/c-client-uninstalled.pc.in
-share/genom/templates/common/c-client.pc.in
-share/genom/templates/common/client.h
-share/genom/templates/common/genom.gen
-share/genom/templates/common/json-types.h
-share/genom/templates/example/example.Makefile.am
-share/genom/templates/example/example.c
-share/genom/templates/example/example.configure.ac
-share/genom/templates/example/example.tcl
-share/genom/templates/example/template.tcl
-share/genom/templates/interactive/template.tcl
-share/genom/templates/mappings/codels.h
-share/genom/templates/mappings/template.tcl
-share/genom/templates/skeleton/ag_templates.m4
-share/genom/templates/skeleton/codels.Makefile.am
-share/genom/templates/skeleton/codels.codel.c
-share/genom/templates/skeleton/codels.codel.cc
-share/genom/templates/skeleton/component-uninstalled.pc.in
-share/genom/templates/skeleton/component.pc.in
-share/genom/templates/skeleton/template.tcl
-share/genom/templates/skeleton/top.Makefile.am
-share/genom/templates/skeleton/top.configure.ac
diff --git a/genom3/PLIST.templates b/genom3/PLIST.templates
deleted file mode 100644
index cffd0faac023df1adc37a91847b77268c470af79..0000000000000000000000000000000000000000
--- a/genom3/PLIST.templates
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment Thu May 16 18:16:18 CEST 2013
-
-@comment pocolibs/server
-${PLIST.pocolibs-server}bin/${GENOM_MODULE}-pocolibs
-
-@comment pocolibs/client/c
-${PLIST.pocolibs-client-c}include/genom/pocolibs/${GENOM_MODULE}/c/client.h
-${PLIST.pocolibs-client-c}lib/genom/pocolibs/plugins/${GENOM_MODULE}.la
-${PLIST.pocolibs-client-c}lib/genom/pocolibs/lib${GENOM_MODULE}-c-client.la
-${PLIST.pocolibs-client-c}lib/pkgconfig/genom/pocolibs/${GENOM_MODULE}-c-client.pc
-
-@comment ros/server
-${PLIST.ros-server}bin/${GENOM_MODULE}-ros
-
-@comment ros/client/c
-${PLIST.ros-client-c}include/genom/ros/${GENOM_MODULE}/c/client.h
-${PLIST.ros-client-c}lib/genom/ros/plugins/${GENOM_MODULE}.la
-${PLIST.ros-client-c}lib/genom/ros/lib${GENOM_MODULE}-c-client.la
-${PLIST.ros-client-c}lib/pkgconfig/genom/ros/${GENOM_MODULE}-c-client.pc
-
-@comment ros/client/ros is a dynamic PLIST generated by module.mk
-
-@comment openprs/client
-${PLIST.openprs}lib/genom/client/openprs/${GENOM_MODULE}-openprs-client.la
-${PLIST.openprs}lib/pkgconfig/${GENOM_MODULE}-openprs-client.pc
-${PLIST.openprs}share/openprs/site/${GENOM_MODULE}Openprs.inc
-${PLIST.openprs}share/openprs/site/${GENOM_MODULE}Openprs.opf
-${PLIST.openprs}share/openprs/site/${GENOM_MODULE}Openprs.sym
diff --git a/genom3/depend.mk b/genom3/depend.mk
deleted file mode 100644
index 32c721d5c4f49764aec179b335301acbacb21cb4..0000000000000000000000000000000000000000
--- a/genom3/depend.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# robotpkg depend.mk for: architecture/genom3
-# Created: Anthony Mallet on Fri, 19 Oct 2012
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-GENOM3_DEPEND_MK:= ${GENOM3_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= genom3
-endif
-
-ifeq (+,$(GENOM3_DEPEND_MK)) # ---------------------------------------------
-
-DEPEND_USE+= genom3
-PREFER.genom3?= robotpkg
-
-SYSTEM_SEARCH.genom3=\
- 'bin/genom3:p:% --version' \
- include/genom3/c/client.h \
- 'lib/pkgconfig/genom3.pc:/Version/s/[^0-9.]//gp'
-
-DEPEND_ABI.genom3?= genom3>=2.99.24
-DEPEND_DIR.genom3?= ../../wip/genom3
-
-export GENOM3= ${PREFIX.genom3}/bin/genom3
-
-endif # GENOM3_DEPEND_MK ----------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/genom3/distinfo b/genom3/distinfo
deleted file mode 100644
index c08676f44ac08ff893c233251396459ca3f277bb..0000000000000000000000000000000000000000
--- a/genom3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA1 (genom-2.99.25.tar.gz) = 8072606fc1a0593f6c802ff6b856f1b264f97e33
-RMD160 (genom-2.99.25.tar.gz) = f97ca6a1a0a612a14cbe7d53b02bafd5423d4985
-Size (genom-2.99.25.tar.gz) = 805638 bytes
diff --git a/genom3/module.mk b/genom3/module.mk
deleted file mode 100644
index e1574817009e97e6a21e2c89aed19be657c19692..0000000000000000000000000000000000000000
--- a/genom3/module.mk
+++ /dev/null
@@ -1,211 +0,0 @@
-# robotpkg module.mk for: wip/genom3
-# Created: Anthony Mallet on Tue May 14 2013
-#
-
-ifndef GENOM_MODULE_MK
-GENOM_MODULE_MK=defined
-
-# --- generic rules --------------------------------------------------------
-
-GENOM_MODULE?= ${PKGBASE:-genom3=}
-GENOM_ARGS?=
-
-TEMPLATES_WRKDIR?= ${WRKDIR}/templates
-CODELS_WRKSRC?= $(if $(filter codels,${PKG_OPTIONS}),${WRKSRC})
-TMPL1_WRKSRC?=
-TMPL2_WRKSRC?=
-
-# codels must be configured/built before templates, and some templates require
-# proper ordering (namely, openprs requires client-c).
-CONFIGURE_DIRS?= ${CODELS_WRKSRC} ${TMPL1_WRKSRC} ${TMPL2_WRKSRC}
-AUTORECONF_DIRS?= ${CODELS_WRKSRC}
-GNU_CONFIGURE= yes
-
-# inter-templates dependencies
-PKG_CONFIG_DIRS+= ${CODELS_WRKSRC} ${TMPL1_WRKSRC} ${TMPL2_WRKSRC}
-
-
-# generate a template
-genom3-generate(%): .FORCE
- @${STEP_MSG} "Generating $*"
- ${RUN} ${GENOM3} ${GENOM_ARGS} \
- $* -C ${TEMPLATES_WRKDIR}/$* ${WRKSRC}/${GENOM_MODULE}.gen
-
-# autoreconf a template
-genom3-autoreconf(%): genom3-generate(%)
- @${STEP_MSG} "Running autoreconf for $*"
- ${RUN} cd ${TEMPLATES_WRKDIR}/$*; \
- ${SETENV} ${CONFIGURE_ENV} ${AUTORECONF} -vif
-
-
-# --- options --------------------------------------------------------------
-
-# codels
-PKG_SUPPORTED_OPTIONS+= codels
-PKG_SUGGESTED_OPTIONS+= codels
-PKG_OPTION_DESCR.codels= Build server codels
-
-# pocolibs
-PKG_SUPPORTED_OPTIONS+= pocolibs-server
-PKG_OPTION_DESCR.pocolibs-server= Build a pocolibs server
-define PKG_OPTION_SET.pocolibs-server
- ifeq (,$(filter codels,${PKG_OPTIONS}))
- PKG_FAIL_REASON+= "'pocolibs-server' option for ${PKGBASE} requires the"
- PKG_FAIL_REASON+= "following options to be enabled:"
- PKG_FAIL_REASON+= codels
- endif
-
- TMPL1_WRKSRC+= ${TEMPLATES_WRKDIR}/pocolibs/server
-
- pre-configure: genom3-autoreconf(pocolibs/server)
-
- include ../../middleware/pocolibs/depend.mk
- include ../../wip/genom3-pocolibs/depend.mk
-endef
-
-PKG_SUPPORTED_OPTIONS+= pocolibs-client-c
-PKG_OPTION_DESCR.pocolibs-client-c= Build a pocolibs C client
-define PKG_OPTION_SET.pocolibs-client-c
- TMPL1_WRKSRC+= ${TEMPLATES_WRKDIR}/pocolibs/client/c
-
- pre-configure: genom3-autoreconf(pocolibs/client/c)
-
- include ../../middleware/pocolibs/depend.mk
- include ../../wip/genom3-pocolibs/depend.mk
-endef
-
-# ros
-PKG_SUPPORTED_OPTIONS+= ros-server
-PKG_OPTION_DESCR.ros-server= Build a ROS server
-define PKG_OPTION_SET.ros-server
- ifeq (,$(filter codels,${PKG_OPTIONS}))
- PKG_FAIL_REASON+= "'ros-server' option for ${PKGBASE} requires the"
- PKG_FAIL_REASON+= "following options to be enabled:"
- PKG_FAIL_REASON+= codels
- endif
-
- TMPL1_WRKSRC+= ${TEMPLATES_WRKDIR}/ros/server
- CONFIGURE_ARGS.${TEMPLATES_WRKDIR}/ros/server+=\
- --with-boost=${PREFIX.boost-headers} \
- --with-boost-libdir=$(dir $(lastword ${SYSTEM_FILES.boost-lib-thread})) \
- --with-boost-thread=boost_thread${BOOST_LIB_SUFFIX}
-
- USE_BOOST_LIBS+= thread
-
- pre-configure: genom3-autoreconf(ros/server)
-
- include ../../devel/boost-headers/depend.mk
- include ../../devel/boost-libs/depend.mk
- include ../../devel/ros-ros/depend.mk
- include ../../interfaces/ros-common-msgs/depend.mk
- include ../../middleware/ros-actionlib/depend.mk
- include ../../middleware/ros-comm/depend.mk
- include ../../sysutils/ros-rospack/depend.mk
- include ../../wip/genom3-ros/depend.mk
- include ../../mk/language/c++.mk
-endef
-
-PKG_SUPPORTED_OPTIONS+= ros-client-c
-PKG_OPTION_DESCR.ros-client-c= Build a ROS C client
-define PKG_OPTION_SET.ros-client-c
- TMPL1_WRKSRC+= ${TEMPLATES_WRKDIR}/ros/client/c
- CONFIGURE_ARGS.${TEMPLATES_WRKDIR}/ros/client/c+=\
- --with-boost=${PREFIX.boost-headers}
-
- pre-configure: genom3-autoreconf(ros/client/c)
-
- include ../../devel/boost-headers/depend.mk
- include ../../devel/ros-ros/depend.mk
- include ../../interfaces/ros-common-msgs/depend.mk
- include ../../middleware/ros-actionlib/depend.mk
- include ../../middleware/ros-comm/depend.mk
- include ../../sysutils/ros-rospack/depend.mk
- include ../../wip/genom3-ros/depend.mk
- include ../../mk/language/c++.mk
-endef
-
-PKG_SUPPORTED_OPTIONS+= ros-client-ros
-PKG_OPTION_DESCR.ros-client-ros= Build a ROS client
-define PKG_OPTION_SET.ros-client-ros
- TMPL1_WRKSRC+= ${TEMPLATES_WRKDIR}/ros/client/ros
-
- # the PLIST heavily depends on the actual list of services
- GENERATE_PLIST+=\
- ${CAT} ${TEMPLATES_WRKDIR}/ros/client/ros/plist | ${AWK} ' \
- { sub("^${PREFIX}/?", ""); print } \
- ';
-
- # hackish ... but this is for a PLIST.guess anyway, so nothing critical
- PRINT_PLIST_AWK_FILTERS+=\
- /include\/${GENOM_MODULE}\// {next} \
- /$(subst /,\/,${PYTHON_SITELIB})\/${GENOM_MODULE}\// {next} \
- /share\/${GENOM_MODULE}\/manifest.xml$$/ {next} \
- /share\/${GENOM_MODULE}\/msg/ {next} \
- /share\/${GENOM_MODULE}\/srv/ {next}
-
- pre-configure: genom3-autoreconf(ros/client/ros)
-
- include ../../devel/boost-headers/depend.mk
- include ../../devel/ros-ros/depend.mk
- include ../../interfaces/ros-common-msgs/depend.mk
- include ../../middleware/ros-actionlib/depend.mk
- include ../../middleware/ros-comm/depend.mk
- include ../../sysutils/ros-rospack/depend.mk
- include ../../wip/genom3-ros/depend.mk
- include ../../mk/language/c++.mk
- include ../../mk/sysdep/python.mk
-endef
-
-# openprs
-PKG_SUPPORTED_OPTIONS+= openprs
-PKG_OPTION_DESCR.openprs= Build an OpenPRS client
-define PKG_OPTION_SET.openprs
- ifeq (,$(filter %-client-c,${PKG_OPTIONS}))
- PKG_FAIL_REASON+= "'openprs' option for ${PKGBASE} requires one of the"
- PKG_FAIL_REASON+= "following options to be enabled:"
- PKG_FAIL_REASON+= $(filter %-client-c,${PKG_SUPPORTED_OPTIONS})
- endif
-
- TMPL2_WRKSRC+= ${TEMPLATES_WRKDIR}/openprs/client
-
- pre-configure: genom3-autoreconf(openprs/client)
-
- include ../../supervision/openprs/depend.mk
- include ../../wip/genom3-openprs/depend.mk
- include ../../wip/transgen3/depend.mk
-endef
-
-
-# --- plist ----------------------------------------------------------------
-
-# Add extra replacement in PLISTs and a generic template for standard genom
-# files
-PLIST_TEMPLATES= wip/genom3/PLIST.templates
-PLIST_SUBST+= GENOM_MODULE=$(call quote,${GENOM_MODULE})
-
-GENERATE_PLIST+= ${CAT} ${ROBOTPKG_DIR}/${PLIST_TEMPLATES};
-
-PRINT_PLIST_AWK_SUBST+= gsub("${GENOM_MODULE}", "$${GENOM_MODULE}");
-PRINT_PLIST_AWK_FILTERS=
-PRINT_PLIST_FILTER+=\
- | ${AWK} ' \
- BEGIN { print "@comment includes ${PLIST_TEMPLATES}" } \
- ${PRINT_PLIST_AWK_FILTERS} \
- NR > FNR { \
- if (!($$0 in filter)) print "$${PLIST.codels}" $$0; next; \
- } \
- { gsub("[$$]{GENOM_MODULE}", "${GENOM_MODULE}") } \
- { gsub("[$$]{PLIST[^}]*}", "") } \
- { filter[$$0] } \
- ' ${ROBOTPKG_DIR}/${PLIST_TEMPLATES} -
-
-
-# --- common dependencies --------------------------------------------------
-
-include ../../pkgtools/libtool/depend.mk
-include ../../pkgtools/pkg-config/depend.mk
-include ../../mk/sysdep/autoconf.mk
-include ../../mk/sysdep/automake.mk
-include ../../wip/genom3/depend.mk
-
-endif # GENOM_MODULE_MK
diff --git a/genomix/Makefile b/genomix/Makefile
index d2bb16e47eb1f458856319eed114b75531b14c64..e5a1bfbb0cd9eff382c77b31b75eb5e8a66b1a23 100644
--- a/genomix/Makefile
+++ b/genomix/Makefile
@@ -20,7 +20,7 @@ NOT_FOR_PLATFORM= # empty
DEPEND_ABI.tcl= tcl>=8.5
include ../../pkgtools/pkg-config/depend.mk
-include ../../wip/genom3/depend.mk
+include ../../architecture/genom3/depend.mk
include ../../mk/sysdep/tcl.mk
include ../../mk/language/c.mk
include ../../mk/robotpkg.mk
diff --git a/optitrack-genom3/Makefile b/optitrack-genom3/Makefile
index 8ed54f2f3437ad397b55211e446dd8a3bf44c585..65f18ad085877016e694ff46eff91206f2ac5f88 100644
--- a/optitrack-genom3/Makefile
+++ b/optitrack-genom3/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= openrobots@laas.fr
COMMENT= Export motion capture data from an Optitrack system
LICENSE= isc
-include ../../wip/genom3/module.mk
+include ../../architecture/genom3/module.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../wip/openrobots-idl/depend.mk
diff --git a/transgen3/Makefile b/transgen3/Makefile
index e6c84610984936b9dd6a5bd41b5d0abf4fd586cd..8918688c498fda28b24bec47d616ef74d09ab1c1 100644
--- a/transgen3/Makefile
+++ b/transgen3/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
DEPEND_ABI.openprs= openprs>=1.1b8
-include ../../wip/genom3/depend.mk
+include ../../architecture/genom3/depend.mk
include ../../supervision/openprs/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/bison.mk