diff --git a/build_tools/Makefile.generic-shared-object b/build_tools/Makefile.generic-shared-object index 12b1457..49aba3d 100644 --- a/build_tools/Makefile.generic-shared-object +++ b/build_tools/Makefile.generic-shared-object @@ -42,7 +42,7 @@ endif # Generazione delle applicazioni $(BINDIR)/%: %.o $(SONAME) @$(MESSAGE) "Linking application `basename "$@"`" - @$(PRETTY) "$(CXX) $(LDFLAGS) -L$(LIBDIR) $(LIBS) -l$(LIBNAME) $< -o $@" + @$(PRETTY) "$(CXX) $< -l$(LIBNAME) $(LDFLAGS) -L$(LIBDIR) $(LIBS) -o $@" #Generazione dei moc files moc_%.cpp: %.h diff --git a/gridfastslam/Makefile b/gridfastslam/Makefile index 87ec52a..c73cec1 100644 --- a/gridfastslam/Makefile +++ b/gridfastslam/Makefile @@ -2,7 +2,7 @@ OBJS= gridslamprocessor_tree.o motionmodel.o gridslamprocessor.o gfsreader.o APPS= gfs2log gfs2rec gfs2neff #gfs2stat #LDFLAGS+= -lutils -lsensor_range -llog -lscanmatcher -lsensor_base -lsensor_odometry $(GSL_LIB) -LDFLAGS+= -lutils -lsensor_range -llog -lscanmatcher -lsensor_base -lsensor_odometry +LDFLAGS+= -lscanmatcher -llog -lsensor_range -lsensor_odometry -lsensor_base -lutils #CPPFLAGS+=-I../sensor $(GSL_INCLUDE) CPPFLAGS+=-I../sensor diff --git a/gui/Makefile b/gui/Makefile index f262bbe..998f74a 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -3,7 +3,7 @@ OBJS= gsp_thread.o qparticleviewer.o qgraphpainter.o qmappainter.o APPS= gfs_nogui gfs_simplegui gfs2img -LDFLAGS+= $(QT_LIB) $(KDE_LIB) -lutils -lsensor_range -llog -lgridfastslam -lpthread -lconfigfile -lsensor_base -lscanmatcher +LDFLAGS+= $(QT_LIB) $(KDE_LIB) -lgridfastslam -lscanmatcher -llog -lsensor_range -lsensor_odometry -lsensor_base -lconfigfile -lutils -lpthread ifeq ($(CARMENSUPPORT),1) LDFLAGS+= -lcarmenwrapper diff --git a/log/Makefile b/log/Makefile index 5ba38e3..02a0515 100644 --- a/log/Makefile +++ b/log/Makefile @@ -1,7 +1,7 @@ OBJS= configuration.o carmenconfiguration.o sensorlog.o sensorstream.o APPS= log_test log_plot scanstudio2carmen rdk2carmen -LDFLAGS+= -lsensor_base -l sensor_odometry -l sensor_range +LDFLAGS+= -lsensor_range -lsensor_odometry -lsensor_base CPPFLAGS+= -I../sensor -include ../global.mk diff --git a/scanmatcher/Makefile b/scanmatcher/Makefile index a9aa1d1..b100595 100644 --- a/scanmatcher/Makefile +++ b/scanmatcher/Makefile @@ -2,7 +2,7 @@ OBJS= smmap.o scanmatcher.o scanmatcherprocessor.o eig3.o APPS= scanmatch_test icptest #LDFLAGS+= $(GSL_LIB) -lutils -lsensor_range -llog -LDFLAGS+= -lutils -lsensor_range -lsensor_base -llog +LDFLAGS+= -llog -lsensor_range -lsensor_odometry -lsensor_base -lutils #CPPFLAGS+=-I../sensor $(GSL_INCLUDE) CPPFLAGS+=-I../sensor