corrected the destination of some source files

ulrichard · Jan 19, 2012 · 864cf89 · 864cf89
1 parent 923922e
commit 864cf89
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/debian/arexx-robotarm-examples.install b/debian/arexx-robotarm-examples.install
@@ -1,11 +1,9 @@
-/usr/share/robotloader/examples/*.*
 /usr/share/robotloader/examples/RobotArmLib/*/*.c
 /usr/share/robotloader/examples/RobotArmLib/*/*.h
 /usr/share/robotloader/examples/RobotArmLib/*/*.o
-/usr/share/robotloader/examples/RobotArmLib/*.*
+/usr/share/robotloader/examples/RobotArmLib/arexx_robot_arm.a
 /usr/share/robotloader/examples/RobotArmExamples/*/*.c
 /usr/share/robotloader/examples/RobotArmExamples/*/*.h
-/usr/share/robotloader/examples/RobotArmExamples/*/*.pnp*
 /usr/share/robotloader/examples/RobotArmExamples/*/Makefile
 /usr/share/robotloader/examples/RobotArmExamples/Calibrate_*/*.hex
 /usr/share/robotloader/examples/RobotArmExamples/Example_/*.hex

diff --git a/examples/RobotArmLib/CMakeLists.txt b/examples/RobotArmLib/CMakeLists.txt
@@ -21,8 +21,8 @@ INSTALL(FILES FindArexxRobotArm.cmake            DESTINATION ${CMAKE_INSTALL_PRE
 INSTALL(FILES arexx_robot_arm_crosscompile.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake-2.8/Modules)
 SET(LibTargetDir ${CMAKE_INSTALL_PREFIX}/share/robotloader/examples/RobotArmLib)
 INSTALL(FILES RobotArmBase/RobotArmBase.h    DESTINATION ${LibTargetDir}/RobotArmBase)
-INSTALL(FILES RobotArmBase/RobotArmBaseLib.c DESTINATION ${LibTargetDir}/RobotArmLib/RobotArmBase)
-INSTALL(FILES RobotArmBase/RobotArmBaseLib.h DESTINATION ${LibTargetDir}/RobotArmLib/RobotArmBase)
+INSTALL(FILES RobotArmBase/RobotArmBaseLib.c DESTINATION ${LibTargetDir}/RobotArmBase)
+INSTALL(FILES RobotArmBase/RobotArmBaseLib.h DESTINATION ${LibTargetDir}/RobotArmBase)
 INSTALL(FILES RobotArmBase/RobotArmUart.c    DESTINATION ${LibTargetDir}/RobotArmBase)
 INSTALL(FILES RobotArmBase/RobotArmUart.h    DESTINATION ${LibTargetDir}/RobotArmBase)
 INSTALL(FILES RobotArmI2C/I2C_Yeti_Display.c DESTINATION ${LibTargetDir}/RobotArmI2C)

diff --git a/ros/uc_arm/ArexxArmHardware.h b/ros/uc_arm/ArexxArmHardware.h
@@ -1,10 +1,7 @@
 #pragma once
 
 // robot arm lib
-//extern "C"
-//{
-    #include "RobotArmBaseLib.h"
-//}
+#include <RobotArmBaseLib.h>
 
 
 class ArexxArmHardware