Fixes to compile with ulut based logging

diff --git a/src/robofsm/Makefile.omk b/src/robofsm/Makefile.omk
index 726e7325b9560ebfd9ee86c467654d683a1f9656..d4302df9b6b8e20178ed369a0c5f57a7c19f5155 100644 (file)
--- a/src/robofsm/Makefile.omk
+++ b/src/robofsm/Makefile.omk
@@ -32,9 +32,9 @@ lib_LIBRARIES += cornslib
 cornslib_SOURCES = corns_configs.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 cornslib
+lib_LOADLIBES = robot mcl robomath roboorte robottype pthread rt m     \
+               orte pathplan sharp map fsm rbtree motion robodim       \
+               actlib cornslib ulut
 
 # Automatic generation of event definition files
 include-pass_HOOKS = roboevent.c roboevent.h

diff --git a/src/robofsm/robot.c b/src/robofsm/robot.c
index be1bde92a822ff09c3895817442545832e45c5ea..87028b1fa2f005c45df07e03064a5e3a88c94af0 100644 (file)
--- a/src/robofsm/robot.c
+++ b/src/robofsm/robot.c
@@ -27,7 +27,7 @@
 #include <robodim.h>
 #include <ul_log.h>
 
-extern UL_LOG_CUST(ulogd_robot); /* Log domain name = ulogf + name of the file */
+UL_LOG_CUST(ulogd_robot); /* Log domain name = ulogd + name of the file */
 
 
 #define MOTION_CONTROL_INIT_ONLY
@@ -269,7 +269,7 @@ void robot_destroy()
        fsm_destroy(&robot.fsm.motion);
        fsm_destroy(&robot.fsm.act);
        ShmapFree();
-       ul_logdbg("robofsm: stop.\n");
+       ul_logdeb("robofsm: stop.\n");
 }
 
 void robot_get_est_pos_trans(double *x, double *y, double *phi)

diff --git a/src/robofsm/test/Makefile.omk b/src/robofsm/test/Makefile.omk
index b018a7e59b6cd888508fa674651f043a995dbc66..f0162f52667768269c68b4e02ec3b5fcd2b34039 100644 (file)
--- a/src/robofsm/test/Makefile.omk
+++ b/src/robofsm/test/Makefile.omk
@@ -41,7 +41,7 @@ test_vidle_SOURCES = tune_vidle.cc ../common-states.cc
 #test_actuators_SOURCES = test_actuators.cc
 
 # Libraries linked to all programs in this Makefile
-lib_LOADLIBES = robot mcl robodim laser-nav robomath   \
-               roboorte robottype pthread rt m orte pathplan   \
-               sharp map fsm rbtree motion actlib cornslib
+lib_LOADLIBES = robot mcl robodim laser-nav robomath roboorte          \
+               robottype pthread rt m orte pathplan sharp map fsm      \
+               rbtree motion actlib cornslib ulut