servo: update to use cmake macro for servo

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>

diff --git a/src/servo/CMakeLists.txt b/src/servo/CMakeLists.txt
index 73d09c2..2a5d527 100644 (file)
--- a/src/servo/CMakeLists.txt
+++ b/src/servo/CMakeLists.txt
@@ -1,12 +1,5 @@
 set (libname "servo")
-add_library (servo SHARED servo.cxx es08a.cxx)
-include_directories (${MAA_INCLUDE_DIR})
-target_link_libraries (servo ${MAA_LIBRARIES})
-
-install (TARGETS ${libname} DESTINATION lib/upm COMPONENT ${libname})
-install (FILES servo.h DESTINATION include/upm COMPONENT ${libname})
-
-if (IPK)
-  cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)
-  set(CPACK_COMPONENT_${libname}_DESCRIPTION "libupm servo")
-endif()
+set (libdescription "upm servo")
+set (module_src servo.cxx es08a.cxx)
+set (module_h servo.h es08a.h)
+upm_module_init()

diff --git a/src/servo/jsupm_es08a.i b/src/servo/jsupm_es08a.i
deleted file mode 100644 (file)
index 00e51d8..0000000
--- a/src/servo/jsupm_es08a.i
+++ /dev/null
@@ -1,7 +0,0 @@
-%module jsupm_es08a
-
-%{
-    #include "es08a.h"
-%}
-
-%include "es08a.h"

diff --git a/src/servo/jsupm_servo.i b/src/servo/jsupm_servo.i
new file mode 100644 (file)
index 0000000..affb34d
--- /dev/null
+++ b/src/servo/jsupm_servo.i
@@ -0,0 +1,7 @@
+%module jsupm_servo
+
+%{
+    #include "servo.h"
+%}
+
+%include "servo.h"

diff --git a/src/servo/pyupm_es08a.i b/src/servo/pyupm_servo.i
similarity index 79%
rename from src/servo/pyupm_es08a.i
rename to src/servo/pyupm_servo.i
index 3262ba3..c9ca763 100644 (file)
--- a/src/servo/pyupm_es08a.i
+++ b/src/servo/pyupm_servo.i
@@ -1,4 +1,4 @@
-%module pyupm_es08a
+%module pyupm_servo
 
 %feature("autodoc", "3");