Merge remote-tracking branch 'origin/timn/modules-without-sover'

fawkesrobotics · Feb 1, 2017 · a7c5cc5 · a7c5cc5
2 parents cbb9bb0 + 440761c
commit a7c5cc5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile b/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile
@@ -27,6 +27,7 @@ LIBS_gazebo_libgps = gazsim_msgs
 OBJS_gazebo_libgps = gps.o
 
 INST_LIB_SUBDIR_gazebo_libgps = $(FFLIBSUBDIR)
+NOSOVER_gazebo_libgps=1
 
 OBJS_all    = $(OBJS_gazebo_libgps)
 

diff --git a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile
@@ -27,6 +27,7 @@ LIBS_gazebo_libgyro = gazsim_msgs
 OBJS_gazebo_libgyro = gyro.o
 
 INST_LIB_SUBDIR_gazebo_libgyro = $(FFLIBSUBDIR)
+NOSOVER_gazebo_libgyro=1
 
 OBJS_all    = $(OBJS_gazebo_libgyro)
 

diff --git a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile
@@ -27,6 +27,7 @@ LIBS_gazebo_libmotor = gazsim_msgs
 OBJS_gazebo_libmotor = motor.o
 
 INST_LIB_SUBDIR_gazebo_libmotor = $(FFLIBSUBDIR)
+NOSOVER_gazebo_libmotor=1
 
 OBJS_all    = $(OBJS_gazebo_libmotor)
 

diff --git a/src/plugins/openprs-agent/Makefile b/src/plugins/openprs-agent/Makefile
@@ -37,6 +37,9 @@ OBJS_all = $(OBJS_openprs_agent) $(OBJS_openprs_mod_skiller) \
 INST_LIB_SUBDIR_openprs_mod_skiller  = $(FFLIBSUBDIR)
 INST_LIB_SUBDIR_openprs_mod_protobuf = $(FFLIBSUBDIR)
 INST_LIB_SUBDIR_openprs_mod_navgraph = $(FFLIBSUBDIR)
+NOSOVER_openprs_mod_skiller  = 1
+NOSOVER_openprs_mod_protobuf = 1
+NOSOVER_openprs_mod_navgraph = 1
 
 # Extra files for system-wide install, i.e., "make install"
 FILES_openprs_files   = $(subst $(SRCDIR)/,,$(wildcard $(addprefix $(SRCDIR)/data/,*.opf *.inc *.sym)))

diff --git a/src/plugins/openprs/Makefile b/src/plugins/openprs/Makefile
@@ -43,6 +43,10 @@ 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)
+NOSOVER_openprs_mod_utils = 1
+NOSOVER_openprs_mod_time = 1
+NOSOVER_openprs_mod_blackboard = 1
+NOSOVER_openprs_mod_config = 1
 
 # Extra files for system-wide install, i.e., "make install"
 FILES_openprs_files   = $(subst $(SRCDIR)/,,$(wildcard $(addprefix $(SRCDIR)/data/,*.opf *.inc)))