From 614abb061621d211617df162e2281473fba36167 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Fri, 5 Nov 2010 17:00:09 +0100 Subject: [PATCH] Fixes to compile with ulut based logging --- src/robofsm/Makefile.omk | 6 +++--- src/robofsm/robot.c | 4 ++-- src/robofsm/test/Makefile.omk | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/robofsm/Makefile.omk b/src/robofsm/Makefile.omk index 726e7325..d4302df9 100644 --- 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 be1bde92..87028b1f 100644 --- a/src/robofsm/robot.c +++ b/src/robofsm/robot.c @@ -27,7 +27,7 @@ #include #include -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 b018a7e5..f0162f52 100644 --- 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 -- 2.39.2