MCL a laser-nav have been moved to separated directory.

diff --git a/build/linux/mcl b/build/linux/mcl
new file mode 120000 (symlink)
index 0000000..e40d344
--- /dev/null
+++ b/build/linux/mcl
@@ -0,0 +1 @@
+../../src/mcl
\ No newline at end of file

diff --git a/build/ppc/mcl b/build/ppc/mcl
new file mode 120000 (symlink)
index 0000000..e40d344
--- /dev/null
+++ b/build/ppc/mcl
@@ -0,0 +1 @@
+../../src/mcl
\ No newline at end of file

diff --git a/src/laser-nav/Makefile.omk b/src/laser-nav/Makefile.omk
index 15dc75c9f09479ff0f1c9e4f56b8719d0920f844..4e0f8f81d07607c0d0ee0fdabe464d643b75942b 100644 (file)
--- a/src/laser-nav/Makefile.omk
+++ b/src/laser-nav/Makefile.omk
@@ -1,13 +1,11 @@
 # -*- makefile -*-
 
-SUBDIRS = mcl lasernav
+lib_LIBRARIES = laser-nav
+laser-nav_SOURCES = laser-nav.c
+laser-nav_LIBS = robomath
 
-#bin_PROGRAMS  = laser-nav
+include_HEADERS = laser-nav.h
 
-#include_HEADERS = laser-nav.h
-
-#laser-nav_SOURCES = laser-nav.c mcl.c
-#laser-nav_SOURCES = laser-nav.c
-
-#laser-nav_LIBS = boot_fn arch_drivers sci_channels excptvec misc m
-#laser-nav_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
+test_PROGRAMS  = test_laser-nav
+test_laser-nav_SOURCES = test_laser-nav.c
+test_laser-nav_LIBS = laser-nav robomath m

diff --git a/src/laser-nav/lasernav/laser-nav.c b/src/laser-nav/laser-nav.c
similarity index 100%
rename from src/laser-nav/lasernav/laser-nav.c
rename to src/laser-nav/laser-nav.c

diff --git a/src/laser-nav/lasernav/laser-nav.h b/src/laser-nav/laser-nav.h
similarity index 100%
rename from src/laser-nav/lasernav/laser-nav.h
rename to src/laser-nav/laser-nav.h

diff --git a/src/laser-nav/lasernav/Makefile.omk b/src/laser-nav/lasernav/Makefile.omk
deleted file mode 100644 (file)
index 4e0f8f8..0000000
--- a/src/laser-nav/lasernav/Makefile.omk
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- makefile -*-
-
-lib_LIBRARIES = laser-nav
-laser-nav_SOURCES = laser-nav.c
-laser-nav_LIBS = robomath
-
-include_HEADERS = laser-nav.h
-
-test_PROGRAMS  = test_laser-nav
-test_laser-nav_SOURCES = test_laser-nav.c
-test_laser-nav_LIBS = laser-nav robomath m

diff --git a/src/laser-nav/mcl_gtk/Makefile b/src/laser-nav/mcl_gtk/Makefile
deleted file mode 100644 (file)
index 08cf5ff..0000000
--- a/src/laser-nav/mcl_gtk/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generic directory or leaf node makefile for OCERA make framework
-
-ifndef MAKERULES_DIR
-MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
-endif
-
-ifeq ($(MAKERULES_DIR),)
-all : default
-.DEFAULT::
-       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
-else   
-include $(MAKERULES_DIR)/Makefile.rules
-endif
-

diff --git a/src/laser-nav/lasernav/test_laser-nav.c b/src/laser-nav/test_laser-nav.c
similarity index 100%
rename from src/laser-nav/lasernav/test_laser-nav.c
rename to src/laser-nav/test_laser-nav.c

diff --git a/src/laser-nav/lasernav/Makefile b/src/mcl/Makefile
similarity index 100%
rename from src/laser-nav/lasernav/Makefile
rename to src/mcl/Makefile

diff --git a/src/laser-nav/mcl/Makefile.omk b/src/mcl/Makefile.omk
similarity index 100%
rename from src/laser-nav/mcl/Makefile.omk
rename to src/mcl/Makefile.omk

diff --git a/src/laser-nav/matlab/Makefile b/src/mcl/matlab/Makefile
similarity index 61%
rename from src/laser-nav/matlab/Makefile
rename to src/mcl/matlab/Makefile
index 55f5f15fd654c4cd584653428e084fdf0c1bdf17..a33263a882b839d2bda264561f31cec9c50ff8fe 100644 (file)
--- a/src/laser-nav/matlab/Makefile
+++ b/src/mcl/matlab/Makefile
@@ -1,5 +1,5 @@
 VPATH = ../../motion
-CXXFLAGS += -I$(VPATH) -I../mcl -I../../robomath -I../lasernav -g
+CXXFLAGS += -I$(VPATH) -I../mcl -I../../robomath -g
 
 all: sf_posreg.mexglx sf_trgen.mexglx sf_mcl.mexglx
 
@@ -9,7 +9,7 @@ sf_posreg.mexglx:  sf_posreg.cc balet.cc
 sf_trgen.mexglx: sf_trgen.cc trgen.cc
        mex  $(CXXFLAGS) $^
 
-sf_mcl.mexglx: sf_mcl.c ../mcl/mcl.c ../../robomath/robomath.c ../lasernav/laser-nav.c
+sf_mcl.mexglx: sf_mcl.c ../mcl/mcl.c ../../robomath/robomath.c
        mex $(CXXFLAGS) $^
 
 

diff --git a/src/laser-nav/matlab/beacon_angles.m b/src/mcl/matlab/beacon_angles.m
similarity index 100%
rename from src/laser-nav/matlab/beacon_angles.m
rename to src/mcl/matlab/beacon_angles.m

diff --git a/src/laser-nav/matlab/init.m b/src/mcl/matlab/init.m
similarity index 100%
rename from src/laser-nav/matlab/init.m
rename to src/mcl/matlab/init.m

diff --git a/src/laser-nav/matlab/kinematics.m b/src/mcl/matlab/kinematics.m
similarity index 100%
rename from src/laser-nav/matlab/kinematics.m
rename to src/mcl/matlab/kinematics.m

diff --git a/src/laser-nav/matlab/localize.m b/src/mcl/matlab/localize.m
similarity index 100%
rename from src/laser-nav/matlab/localize.m
rename to src/mcl/matlab/localize.m

diff --git a/src/laser-nav/matlab/mcl_test.mdl b/src/mcl/matlab/mcl_test.mdl
similarity index 100%
rename from src/laser-nav/matlab/mcl_test.mdl
rename to src/mcl/matlab/mcl_test.mdl

diff --git a/src/laser-nav/matlab/reg_test.mdl b/src/mcl/matlab/reg_test.mdl
similarity index 100%
rename from src/laser-nav/matlab/reg_test.mdl
rename to src/mcl/matlab/reg_test.mdl

diff --git a/src/laser-nav/matlab/robot_test.mdl b/src/mcl/matlab/robot_test.mdl
similarity index 100%
rename from src/laser-nav/matlab/robot_test.mdl
rename to src/mcl/matlab/robot_test.mdl

diff --git a/src/laser-nav/matlab/sf_mcl.c b/src/mcl/matlab/sf_mcl.c
similarity index 100%
rename from src/laser-nav/matlab/sf_mcl.c
rename to src/mcl/matlab/sf_mcl.c

diff --git a/src/laser-nav/matlab/sf_posreg.cc b/src/mcl/matlab/sf_posreg.cc
similarity index 100%
rename from src/laser-nav/matlab/sf_posreg.cc
rename to src/mcl/matlab/sf_posreg.cc

diff --git a/src/laser-nav/matlab/sf_trgen.cc b/src/mcl/matlab/sf_trgen.cc
similarity index 100%
rename from src/laser-nav/matlab/sf_trgen.cc
rename to src/mcl/matlab/sf_trgen.cc

diff --git a/src/laser-nav/matlab/sfdrawbitmap.m b/src/mcl/matlab/sfdrawbitmap.m
similarity index 100%
rename from src/laser-nav/matlab/sfdrawbitmap.m
rename to src/mcl/matlab/sfdrawbitmap.m

diff --git a/src/laser-nav/matlab/sfdrawrobot.m b/src/mcl/matlab/sfdrawrobot.m
similarity index 100%
rename from src/laser-nav/matlab/sfdrawrobot.m
rename to src/mcl/matlab/sfdrawrobot.m

diff --git a/src/laser-nav/mcl/mcl.c b/src/mcl/mcl.c
similarity index 100%
rename from src/laser-nav/mcl/mcl.c
rename to src/mcl/mcl.c

diff --git a/src/laser-nav/mcl/mcl.h b/src/mcl/mcl.h
similarity index 100%
rename from src/laser-nav/mcl/mcl.h
rename to src/mcl/mcl.h

diff --git a/src/laser-nav/mcl/Makefile b/src/mcl/mcl_gtk/Makefile
similarity index 100%
rename from src/laser-nav/mcl/Makefile
rename to src/mcl/mcl_gtk/Makefile

diff --git a/src/laser-nav/mcl_gtk/Makefile.omk b/src/mcl/mcl_gtk/Makefile.omk
similarity index 100%
rename from src/laser-nav/mcl_gtk/Makefile.omk
rename to src/mcl/mcl_gtk/Makefile.omk

diff --git a/src/laser-nav/mcl_gtk/README b/src/mcl/mcl_gtk/README
similarity index 100%
rename from src/laser-nav/mcl_gtk/README
rename to src/mcl/mcl_gtk/README

diff --git a/src/laser-nav/mcl_gtk/TODO b/src/mcl/mcl_gtk/TODO
similarity index 100%
rename from src/laser-nav/mcl_gtk/TODO
rename to src/mcl/mcl_gtk/TODO

diff --git a/src/laser-nav/mcl_gtk/images/background.xpm b/src/mcl/mcl_gtk/images/background.xpm
similarity index 100%
rename from src/laser-nav/mcl_gtk/images/background.xpm
rename to src/mcl/mcl_gtk/images/background.xpm

diff --git a/src/laser-nav/mcl_gtk/images/point3x3b.xpm b/src/mcl/mcl_gtk/images/point3x3b.xpm
similarity index 100%
rename from src/laser-nav/mcl_gtk/images/point3x3b.xpm
rename to src/mcl/mcl_gtk/images/point3x3b.xpm

diff --git a/src/laser-nav/mcl_gtk/images/point3x3c.xpm b/src/mcl/mcl_gtk/images/point3x3c.xpm
similarity index 100%
rename from src/laser-nav/mcl_gtk/images/point3x3c.xpm
rename to src/mcl/mcl_gtk/images/point3x3c.xpm

diff --git a/src/laser-nav/mcl_gtk/images/point3x3g.xpm b/src/mcl/mcl_gtk/images/point3x3g.xpm
similarity index 100%
rename from src/laser-nav/mcl_gtk/images/point3x3g.xpm
rename to src/mcl/mcl_gtk/images/point3x3g.xpm

diff --git a/src/laser-nav/mcl_gtk/images/point3x3r.xpm b/src/mcl/mcl_gtk/images/point3x3r.xpm
similarity index 100%
rename from src/laser-nav/mcl_gtk/images/point3x3r.xpm
rename to src/mcl/mcl_gtk/images/point3x3r.xpm

diff --git a/src/laser-nav/mcl_gtk/images/point3x3y.xpm b/src/mcl/mcl_gtk/images/point3x3y.xpm
similarity index 100%
rename from src/laser-nav/mcl_gtk/images/point3x3y.xpm
rename to src/mcl/mcl_gtk/images/point3x3y.xpm

diff --git a/src/laser-nav/mcl_gtk/images/robot.xpm b/src/mcl/mcl_gtk/images/robot.xpm
similarity index 100%
rename from src/laser-nav/mcl_gtk/images/robot.xpm
rename to src/mcl/mcl_gtk/images/robot.xpm

diff --git a/src/laser-nav/mcl_gtk/mcl_gtk.c b/src/mcl/mcl_gtk/mcl_gtk.c
similarity index 100%
rename from src/laser-nav/mcl_gtk/mcl_gtk.c
rename to src/mcl/mcl_gtk/mcl_gtk.c

diff --git a/src/laser-nav/mcl_gtk/mcl_gtk.h b/src/mcl/mcl_gtk/mcl_gtk.h
similarity index 100%
rename from src/laser-nav/mcl_gtk/mcl_gtk.h
rename to src/mcl/mcl_gtk/mcl_gtk.h

diff --git a/src/laser-nav/mcl_gtk/mcl_gtk.sh b/src/mcl/mcl_gtk/mcl_gtk.sh
similarity index 100%
rename from src/laser-nav/mcl_gtk/mcl_gtk.sh
rename to src/mcl/mcl_gtk/mcl_gtk.sh