SUBDIRS = test
-default_CONFIG = CONFIG_OPEN_LOOP=n CONFIG_LOCK_CHECKING=n
+default_CONFIG = CONFIG_LOCK_CHECKING=n HAVE_PRIO_INHERIT=y
config_include_HEADERS = robot_config.h
-robot_config_DEFINES = CONFIG_OPEN_LOOP CONFIG_LOCK_CHECKING
+robot_config_DEFINES = CONFIG_LOCK_CHECKING HAVE_PRIO_INHERIT
-bin_PROGRAMS += robomain
-robomain_SOURCES = main.cc fsmmain.c
+#bin_PROGRAMS += competition
+competition_SOURCES = competition.cc \
+ common-states.cc
+
+bin_PROGRAMS += homologation
+homologation_SOURCES = homologation2012.cc
# Library with general support functions for the robot
lib_LIBRARIES += robot
-robot_SOURCES = robot_orte.c servos.c robot.c fsmmove.cc movehelper.cc \
- motion-control.cc fsmdisplay.c map_handling.c
+robot_SOURCES = robot_orte.c robot.c fsmmove.cc movehelper.cc \
+ motion-control.cc map_handling.cc \
+ match-timing.c
robot_GEN_SOURCES = roboevent.c
include_GEN_HEADERS += roboevent.h
-include_HEADERS += robot.h servos.h movehelper.h robot_orte.h actuators.h
+include_HEADERS += robot.h movehelper.h robot_orte.h actuators.h
lib_LIBRARIES += actlib
actlib_SOURCES = actuators.c
# Libraries linked to all programs in this Makefile
-lib_LOADLIBES = robot mcl robomath roboorte robottype robottype \
- pthread rt m orte pathplan sharp map fsm uoled oledlib \
- rbtree motion robodim sercom
+lib_LOADLIBES = robot mcl robomath roboorte robottype pthread rt m \
+ orte pathplan sharp map fsm rbtree motion robodim \
+ actlib ulut shape_detect
# Automatic generation of event definition files
include-pass_HOOKS = roboevent.c roboevent.h