[Fawkes Git] branch/common/master-merge-review: 13 revs updated. (0.5.0-3354-gb060759)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Tue Sep 6 01:39:58 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, common/master-merge-review has been updated
        to  b060759f71d16bda5d7e0dc67b9fbcef541a4f2c (commit)
       via  58fccf07d86c9c9c2ef37370f738a53599edd569 (commit)
       via  35e6ce6ba8cea724fe7ffc283093ab17604a23df (commit)
       via  82aaa6c446169cb5285bff22940951d2bf71fc14 (commit)
       via  d56e46fcd8b7e96c8bc35cad268373ccc9dd6cd9 (commit)
       via  cc972ac93b2bf1b0b0b418a5f2f8028c322cfccd (commit)
       via  6c3b151adb1d63dcaad2da04d95ea78badb69a83 (commit)
       via  78bc743fe75af7bcedbcdfabda1f947471e8f899 (commit)
       via  b86bae50dc251b6b6ec87b67e7206577c5ff634b (commit)
       via  591b20ec54115d86ef2048da1b3774c2bb99ef40 (commit)
       via  9e602a976eec77920e3832c4d842e56ce3af0b68 (commit)
       via  1cf25d91f000f59dd856378b71a2e7ea8e44a15f (commit)
       via  a2c35e25b99f48d1be673f5dc1743bebaa839d0a (commit)
      from  e709aba74e9081d82096ac2e22ac1552feb88618 (commit)

http://git.fawkesrobotics.org/fawkes.git/common/master-merge-review

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 9e602a976eec77920e3832c4d842e56ce3af0b68
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 17:54:24 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 17:54:24 2016 +0200

    buildsys: do no longer install firevision header to subdir
    
    Put headers in the regular place and keep the fv prefix.

http://git.fawkesrobotics.org/fawkes.git/commit/9e602a9
http://trac.fawkesrobotics.org/changeset/9e602a9

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 591b20ec54115d86ef2048da1b3774c2bb99ef40
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 20:40:30 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 20:40:30 2016 +0200

    buildsys: remove _ in header install dirs
    
    If a library was named like fawkes_protobuf_comm, the resulting install
    directory was _protobuf_comm, which is not the intended directory.
    Therefore, remove a leading underscore.

http://git.fawkesrobotics.org/fawkes.git/commit/591b20e
http://trac.fawkesrobotics.org/changeset/591b20e

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b86bae50dc251b6b6ec87b67e7206577c5ff634b
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 20:46:46 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 20:46:46 2016 +0200

    eclipse_debugger: rename binary to ffeclipse-debugger
    
    Adhere to the Fawkes framework naming convention and disambiguate from
    Eclipse IDE related stuff.

http://git.fawkesrobotics.org/fawkes.git/commit/b86bae5
http://trac.fawkesrobotics.org/changeset/b86bae5

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 78bc743fe75af7bcedbcdfabda1f947471e8f899
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 20:48:26 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 20:48:26 2016 +0200

    lasergui: rename binary to fflasergui
    
    Adhere to naming convention and reduce the number of exceptions. The
    lasergui is no longer as central with rviz integration hence renaming
    can easily be done.

http://git.fawkesrobotics.org/fawkes.git/commit/78bc743
http://trac.fawkesrobotics.org/changeset/78bc743

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 6c3b151adb1d63dcaad2da04d95ea78badb69a83
Merge: 78bc743 1cf25d9
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 21:02:20 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 21:02:20 2016 +0200

    Merge remote-tracking branch 'origin/tneumann/colli-testing/obst-wider-cost-next-to-it'

http://git.fawkesrobotics.org/fawkes.git/commit/6c3b151
http://trac.fawkesrobotics.org/changeset/6c3b151

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit cc972ac93b2bf1b0b0b418a5f2f8028c322cfccd
Merge: 6c3b151 a2c35e2
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 21:03:34 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 21:03:34 2016 +0200

    Merge remote-tracking branch 'origin/tneumann/colli-testing/omni-drive-mode-no-ori-next-target'

http://git.fawkesrobotics.org/fawkes.git/commit/cc972ac
http://trac.fawkesrobotics.org/changeset/cc972ac

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit d56e46fcd8b7e96c8bc35cad268373ccc9dd6cd9
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 22:45:15 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 22:45:15 2016 +0200

    lasergui: fix typo in man page rule

http://git.fawkesrobotics.org/fawkes.git/commit/d56e46f
http://trac.fawkesrobotics.org/changeset/d56e46f

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 82aaa6c446169cb5285bff22940951d2bf71fc14
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 23:01:12 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Mon Sep 5 23:01:12 2016 +0200

    lasergui: update man page to reflect new name of tool

http://git.fawkesrobotics.org/fawkes.git/commit/82aaa6c
http://trac.fawkesrobotics.org/changeset/82aaa6c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 35e6ce6ba8cea724fe7ffc283093ab17604a23df
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 23:52:39 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Tue Sep 6 00:23:29 2016 +0200

    openprs: specify module install path

http://git.fawkesrobotics.org/fawkes.git/commit/35e6ce6
http://trac.fawkesrobotics.org/changeset/35e6ce6

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 58fccf07d86c9c9c2ef37370f738a53599edd569
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 23:53:29 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Tue Sep 6 00:23:29 2016 +0200

    openprs-agent: specify module install path

http://git.fawkesrobotics.org/fawkes.git/commit/58fccf0
http://trac.fawkesrobotics.org/changeset/58fccf0

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b060759f71d16bda5d7e0dc67b9fbcef541a4f2c
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Mon Sep 5 23:59:09 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Tue Sep 6 00:33:03 2016 +0200

    gazebo: specify install path for Gazebo plugins

http://git.fawkesrobotics.org/fawkes.git/commit/b060759
http://trac.fawkesrobotics.org/changeset/b060759

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 etc/buildsys/btypes/rules_sysinstall.mk            |    4 ++--
 .../colli/drive_modes/forward_omni_drive_mode.cpp  |    2 +-
 src/plugins/colli/search/obstacle.h                |   10 +++++-----
 .../gazsim-localization/gazebo-plugin/Makefile     |    2 ++
 .../gazsim-robotino/gazebo-plugin-gyro/Makefile    |    2 ++
 .../gazsim-robotino/gazebo-plugin-motor/Makefile   |    2 ++
 src/plugins/openprs-agent/Makefile                 |    4 ++++
 src/plugins/openprs/Makefile                       |    4 ++++
 src/tools/eclipse_debugger/Makefile                |    8 ++++----
 src/tools/lasergui/Makefile                        |   16 ++++++++--------
 .../lasergui/{lasergui.txt => fflasergui.txt}      |    8 ++++----
 11 files changed, 38 insertions(+), 24 deletions(-)
 rename src/tools/lasergui/{lasergui.txt => fflasergui.txt} (88%)


- *Diffs* -------------------------------------------------------------

- *commit* 9e602a976eec77920e3832c4d842e56ce3af0b68 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 17:54:24 2016 +0200
Subject: buildsys: do no longer install firevision header to subdir

 etc/buildsys/btypes/rules_sysinstall.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk
index 895165e..3058bb5 100644
--- a/etc/buildsys/btypes/rules_sysinstall.mk
+++ b/etc/buildsys/btypes/rules_sysinstall.mk
@@ -21,7 +21,7 @@ $(foreach P,$(PLUGINS_all:$(PLUGINDIR)/%.so=%),$(eval INST_LIB_SUBDIR_$(call nam
 
 # Library headers get subdir matching name if not set
 $(foreach P,$(LIBS_all:$(LIBDIR)/libfawkes%.so=%) $(LIBS_gui:$(LIBDIR)/libfawkes%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfawkes$P)),$P),$(eval INST_HDRS_SUBDIR_libfawkes$P = $P)))
-$(foreach P,$(LIBS_all:$(LIBDIR)/libfv%.so=%) $(LIBS_gui:$(LIBDIR)/libfv%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfv$P)),$P),$(eval INST_HDRS_SUBDIR_libfv$P = firevision/$P)))
+$(foreach P,$(LIBS_all:$(LIBDIR)/libfv%.so=%) $(LIBS_gui:$(LIBDIR)/libfv%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfv$P)),$P),$(eval INST_HDRS_SUBDIR_libfv$P = fv$P)))
 
 ifdef __buildsys_lua_mk_
 # Lua libraries are "inferred" and automatically installed to proper directory

- *commit* 591b20ec54115d86ef2048da1b3774c2bb99ef40 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 20:40:30 2016 +0200
Subject: buildsys: remove _ in header install dirs

 etc/buildsys/btypes/rules_sysinstall.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk
index 3058bb5..9b38c21 100644
--- a/etc/buildsys/btypes/rules_sysinstall.mk
+++ b/etc/buildsys/btypes/rules_sysinstall.mk
@@ -20,7 +20,7 @@ include $(BUILDSYSDIR)/ext/gmsl
 $(foreach P,$(PLUGINS_all:$(PLUGINDIR)/%.so=%),$(eval INST_LIB_SUBDIR_$(call nametr,$P) = $(FFLIBSUBDIR)/plugins))
 
 # Library headers get subdir matching name if not set
-$(foreach P,$(LIBS_all:$(LIBDIR)/libfawkes%.so=%) $(LIBS_gui:$(LIBDIR)/libfawkes%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfawkes$P)),$P),$(eval INST_HDRS_SUBDIR_libfawkes$P = $P)))
+$(foreach P,$(LIBS_all:$(LIBDIR)/libfawkes%.so=%) $(LIBS_gui:$(LIBDIR)/libfawkes%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfawkes$P)),$P),$(eval INST_HDRS_SUBDIR_libfawkes$P = $(P:_%=%))))
 $(foreach P,$(LIBS_all:$(LIBDIR)/libfv%.so=%) $(LIBS_gui:$(LIBDIR)/libfv%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfv$P)),$P),$(eval INST_HDRS_SUBDIR_libfv$P = fv$P)))
 
 ifdef __buildsys_lua_mk_

- *commit* b86bae50dc251b6b6ec87b67e7206577c5ff634b - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 20:46:46 2016 +0200
Subject: eclipse_debugger: rename binary to ffeclipse-debugger

 src/tools/eclipse_debugger/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/eclipse_debugger/Makefile b/src/tools/eclipse_debugger/Makefile
index 5ae78b2..145ca71 100644
--- a/src/tools/eclipse_debugger/Makefile
+++ b/src/tools/eclipse_debugger/Makefile
@@ -41,14 +41,14 @@ endif
 CFLAGS  += $(CFLAGS_GUI) $(CFLAGS_GRAPHVIZ)
 LDFLAGS += $(LDFLAGS_GUI) $(LDFLAGS_GRAPHVIZ)
 
-LIBS_eclipsedebugger = stdc++ m fawkescore fawkesutils fawkesnetcomm fawkesblackboard \
+LIBS_ffeclipse_debugger = stdc++ m fawkescore fawkesutils fawkesnetcomm fawkesblackboard \
 		fawkesguiutils fawkesinterface EclipseDebuggerInterface
-OBJS_eclipsedebugger = main.o eclipse_debugger.o
+OBJS_ffeclipse_debugger = main.o eclipse_debugger.o
 
-OBJS_all = $(OBJS_eclipsedebugger)
+OBJS_all = $(OBJS_ffeclipse_debugger)
 
 ifeq ($(HAVE_GUI),1)
-  BINS_gui = $(BINDIR)/eclipsedebugger 
+  BINS_gui = $(BINDIR)/ffeclipse-debugger 
 else
   WARN_TARGETS += warning_eclipsedebugger
 endif

- *commit* 78bc743fe75af7bcedbcdfabda1f947471e8f899 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 20:48:26 2016 +0200
Subject: lasergui: rename binary to fflasergui

 src/tools/lasergui/Makefile                        |   16 ++++++++--------
 .../lasergui/{lasergui.txt => fflasergui.txt}      |    0
 2 files changed, 8 insertions(+), 8 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/lasergui/Makefile b/src/tools/lasergui/Makefile
index 00bd413..72703c4 100644
--- a/src/tools/lasergui/Makefile
+++ b/src/tools/lasergui/Makefile
@@ -21,7 +21,7 @@ include $(BUILDSYSDIR)/gui.mk
 CFLAGS  += $(CFLAGS_GUI)
 LDFLAGS += $(LDFLAGS_GUI)
 
-LIBS_lasergui = stdc++ m fawkescore fawkesutils fawkesblackboard \
+LIBS_fflasergui = stdc++ m fawkescore fawkesutils fawkesblackboard \
 		fawkesinterface fawkesnetcomm fawkesguiutils \
 		Position2DTrackInterface \
 		Laser360Interface Laser720Interface Laser1080Interface \
@@ -29,23 +29,23 @@ LIBS_lasergui = stdc++ m fawkescore fawkesutils fawkesblackboard \
 
 ifeq ($(BUILD_TYPE),maemo)
   ifeq ($(HAVE_HILDON_GUI),1)
-    OBJS_lasergui = lasergui_hildon.o
-    LIBS_lasergui += osso
+    OBJS_fflasergui = lasergui_hildon.o
+    LIBS_fflasergui += osso
     BUILD_LASERGUI = $(HAVE_GUI)
   else
     WARN_TARGETS += warning_hildonmm
   endif
 else
-  OBJS_lasergui = lasergui.o
+  OBJS_fflasergui = lasergui.o
   BUILD_LASERGUI = $(HAVE_GUI)
 endif
-OBJS_lasergui += laser_drawing_area.o visdisplay.o
-OBJS_all = $(OBJS_lasergui)
+OBJS_fflasergui += laser_drawing_area.o visdisplay.o
+OBJS_all = $(OBJS_fflasergui)
 
 ifeq ($(BUILD_LASERGUI),1)
-  BINS_gui = $(BINDIR)/lasergui
+  BINS_gui = $(BINDIR)/fflasergui
   INST_RESDIRS = guis/lasergui
-  MANPAGES_all = $(MANDIR)/man1/lasergui.1
+  MANPAGES_all = $(MANDIR)/man1/fflasergui.1
 else
   WARN_TARGETS += warning_lasergui
 endif

- *commit* 6c3b151adb1d63dcaad2da04d95ea78badb69a83 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 21:02:20 2016 +0200
Subject: Merge remote-tracking branch 'origin/tneumann/colli-testing/obst-wider-cost-next-to-it'

 src/plugins/colli/search/obstacle.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

_Diff for modified files_:

- *commit* cc972ac93b2bf1b0b0b418a5f2f8028c322cfccd - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 21:03:34 2016 +0200
Subject: Merge remote-tracking branch 'origin/tneumann/colli-testing/omni-drive-mode-no-ori-next-target'

 .../colli/drive_modes/forward_omni_drive_mode.cpp  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:

- *commit* d56e46fcd8b7e96c8bc35cad268373ccc9dd6cd9 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 22:45:15 2016 +0200
Subject: lasergui: fix typo in man page rule

 src/tools/lasergui/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/lasergui/Makefile b/src/tools/lasergui/Makefile
index 72703c4..fd109ec 100644
--- a/src/tools/lasergui/Makefile
+++ b/src/tools/lasergui/Makefile
@@ -45,7 +45,7 @@ OBJS_all = $(OBJS_fflasergui)
 ifeq ($(BUILD_LASERGUI),1)
   BINS_gui = $(BINDIR)/fflasergui
   INST_RESDIRS = guis/lasergui
-  MANPAGES_all = $(MANDIR)/man1/fflasergui.1
+  MANPAGES_gui = $(MANDIR)/man1/fflasergui.1
 else
   WARN_TARGETS += warning_lasergui
 endif

- *commit* 82aaa6c446169cb5285bff22940951d2bf71fc14 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 23:01:12 2016 +0200
Subject: lasergui: update man page to reflect new name of tool

 src/tools/lasergui/fflasergui.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

_Diff for modified files_:
diff --git a/src/tools/lasergui/fflasergui.txt b/src/tools/lasergui/fflasergui.txt
index d6d912f..c78bba7 100644
--- a/src/tools/lasergui/fflasergui.txt
+++ b/src/tools/lasergui/fflasergui.txt
@@ -1,14 +1,14 @@
-lasergui(1)
-===========
+fflasergui(1)
+=============
 
 NAME
 ----
-lasergui - Watch laser scanner data remotely in real-time
+fflasergui - Watch laser scanner data remotely in real-time
 
 SYNOPSIS
 --------
 [verse]
-*lasergui*
+*fflasergui*
 
 DESCRIPTION
 -----------

- *commit* 35e6ce6ba8cea724fe7ffc283093ab17604a23df - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 23:52:39 2016 +0200
Subject: openprs: specify module install path

 src/plugins/openprs/Makefile |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/openprs/Makefile b/src/plugins/openprs/Makefile
index 91b5112..87f9567 100644
--- a/src/plugins/openprs/Makefile
+++ b/src/plugins/openprs/Makefile
@@ -35,6 +35,10 @@ OBJS_openprs_mod_blackboard = mod_blackboard.o
 LIBS_openprs_mod_config = fawkescore fawkesutils fawkesconfig fawkesnetcomm
 OBJS_openprs_mod_config = mod_config.o
 
+INST_LIB_SUBDIR_openprs_mod_utils = $(FFLIBSUBDIR)
+INST_LIB_SUBDIR_openprs_mod_time = $(FFLIBSUBDIR)
+INST_LIB_SUBDIR_openprs_mod_blackboard = $(FFLIBSUBDIR)
+INST_LIB_SUBDIR_openprs_mod_config = $(FFLIBSUBDIR)
 
 OBJS_all = $(OBJS_openprs) $(OBJS_openprs_mod_utils) \
 	   $(OBJS_openprs_mod_time) $(OBJS_openprs_mod_blackboard) \

- *commit* 58fccf07d86c9c9c2ef37370f738a53599edd569 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 23:53:29 2016 +0200
Subject: openprs-agent: specify module install path

 src/plugins/openprs-agent/Makefile |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/openprs-agent/Makefile b/src/plugins/openprs-agent/Makefile
index 0705f99..7383aa2 100644
--- a/src/plugins/openprs-agent/Makefile
+++ b/src/plugins/openprs-agent/Makefile
@@ -31,6 +31,10 @@ OBJS_openprs_mod_protobuf = oprs_protobuf.o mod_protobuf.o
 LIBS_openprs_mod_navgraph = fawkescore fawkesnavgraph fawkesconfig fawkesnetcomm
 OBJS_openprs_mod_navgraph = mod_navgraph.o
 
+INST_LIB_SUBDIR_openprs_mod_skiller  = $(FFLIBSUBDIR)
+INST_LIB_SUBDIR_openprs_mod_protobuf = $(FFLIBSUBDIR)
+INST_LIB_SUBDIR_openprs_mod_navgraph = $(FFLIBSUBDIR)
+
 OBJS_all = $(OBJS_openprs_agent) $(OBJS_openprs_mod_skiller) \
 	   $(OBJS_openprs_mod_protobuf) $(OBJS_openprs_mod_navgraph)
 

- *commit* b060759f71d16bda5d7e0dc67b9fbcef541a4f2c - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Mon Sep 5 23:59:09 2016 +0200
Subject: gazebo: specify install path for Gazebo plugins

 .../gazsim-localization/gazebo-plugin/Makefile     |    2 ++
 .../gazsim-robotino/gazebo-plugin-gyro/Makefile    |    2 ++
 .../gazsim-robotino/gazebo-plugin-motor/Makefile   |    2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile b/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile
index a3963e0..b619a7f 100644
--- a/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile
+++ b/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile
@@ -26,6 +26,8 @@ LIBDIRS_BASE += $(GAZEBO_LIBDIR)
 LIBS_gazebo_libgps = gazsim_msgs
 OBJS_gazebo_libgps = gps.o
 
+INST_LIB_SUBDIR_gazebo_libgps = $(FFLIBSUBDIR)
+
 OBJS_all    = $(OBJS_gazebo_libgps)
 
 ifeq ($(HAVE_GAZEBO)$(HAVE_PROTOBUF),11)
diff --git a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile
index 2d9f392..a0e71de 100644
--- a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile
+++ b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile
@@ -26,6 +26,8 @@ LIBDIRS_BASE += $(GAZEBO_LIBDIR)
 LIBS_gazebo_libgyro = gazsim_msgs
 OBJS_gazebo_libgyro = gyro.o
 
+INST_LIB_SUBDIR_gazebo_libgyro = $(FFLIBSUBDIR)
+
 OBJS_all    = $(OBJS_gazebo_libgyro)
 
 ifeq ($(HAVE_GAZEBO)$(HAVE_PROTOBUF),11)
diff --git a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile
index 262930b..95e20cb 100644
--- a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile
+++ b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile
@@ -26,6 +26,8 @@ LIBDIRS_BASE += $(GAZEBO_LIBDIR)
 LIBS_gazebo_libmotor = gazsim_msgs
 OBJS_gazebo_libmotor = motor.o
 
+INST_LIB_SUBDIR_gazebo_libmotor = $(FFLIBSUBDIR)
+
 OBJS_all    = $(OBJS_gazebo_libmotor)
 
 ifeq ($(HAVE_GAZEBO)$(HAVE_PROTOBUF),11)




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list