robofsm: Strategy pick central buillon

[eurobot/public.git] / src / robofsm / Makefile.omk

diff --git a/src/robofsm/Makefile.omk b/src/robofsm/Makefile.omk
index 62aa1f9deebc0c9c8ac780a2259a66a29190d4e7..8cc25dfb550acb8af0a936c377624dfada0f7162 100644 (file)
--- a/src/robofsm/Makefile.omk
+++ b/src/robofsm/Makefile.omk
@@ -1,62 +1,44 @@
 # -*- makefile -*-
 
-default_CONFIG = CONFIG_OPEN_LOOP=n
-LOCAL_CONFIG_H = robot_config.h
+SUBDIRS = test
 
-# Test application for robot planning
-#bin_PROGRAMS += rpl
-#rpl_SOURCES = robot-planning.cc
+default_CONFIG = CONFIG_LOCK_CHECKING=n HAVE_PRIO_INHERIT=y
 
-bin_PROGRAMS += homologation
-homologation_SOURCES = homologation.cc
-
-bin_PROGRAMS += joystick
-joystick_SOURCES = joystick.cc
-
-bin_PROGRAMS += testpickup
-testpickup_SOURCES = testpickup.cc
-
-bin_PROGRAMS += testcollavoid
-testcollavoid_SOURCES = testcollavoid.cc
-
-bin_PROGRAMS += rectangle
-rectangle_SOURCES = rectangle.cc
-
-bin_PROGRAMS += line
-line_SOURCES = line.cc
+config_include_HEADERS = robot_config.h
+robot_config_DEFINES = CONFIG_LOCK_CHECKING HAVE_PRIO_INHERIT
 
-bin_PROGRAMS += odotest
-odotest_SOURCES = odometry.cc
+bin_PROGRAMS += competition
+competition_SOURCES = competition2012.cc       \
+                     common-states.cc strategy_get_central_buillon.cc
 
-bin_PROGRAMS += follower
-follower_SOURCES = follower.cc
-
-
-# Test application for robot_goto
-bin_PROGRAMS += goto
-goto_SOURCES = robot_goto.cc
+bin_PROGRAMS += homologation
+homologation_SOURCES = homologation2012.cc
 
 # Library with general support functions for the robot
 lib_LIBRARIES += robot
-robot_SOURCES = serva.c robot.c roboorte.c fsmmove.cc \
-               fsmpickup.c fsmdet.c fsmjoy.c \
-               movehelper.cc roboevent.c fsmdisplay.cc
+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
 
-bin_PROGRAMS += test_timer
-test_timer_SOURCES = test_timer.c
+include_HEADERS += robot.h movehelper.h robot_orte.h actuators.h
 
-# Libraries linked to all programs in this Makefile
-lib_LOADLIBES = robot fsm_loc mcl laser-nav robomath robottype pthread \
-               rt m orte pathplan sharp map fsm rbtree motion
+lib_LIBRARIES += actlib
+actlib_SOURCES = actuators.c
 
-lib_LIBRARIES += fsm_loc
-fsm_loc_SOURCES = fsmloc.c
+# Libraries linked to all programs in this Makefile
+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-local: $(SOURCES_DIR)/roboevent.c $(SOURCES_DIR)/roboevent.h
+include-pass_HOOKS = roboevent.c roboevent.h
 
-$(SOURCES_DIR)/roboevent.c $(SOURCES_DIR)/roboevent.h: $(SOURCES_DIR)/roboevent.py
+roboevent.c roboevent.h: $(SOURCES_DIR)/roboevent.py $(SOURCES_DIR)/../fsm/eventgen.py
        @$(QUIET_CMD_ECHO) "  EVENTGEN roboevent"
-       $(Q)cd $(SOURCES_DIR) && python $(SOURCES_DIR)/../fsm/eventgen.py roboevent
-
+       $(Q)python $(SOURCES_DIR)/../fsm/eventgen.py $<
 
+clean-custom:
+       $(Q)rm -f roboevent.c roboevent.h