merge with master tizen_2.1 2.1b_release accepted/tizen/20130530.172116 accepted/tizen/20130607.151920 accepted/tizen_2.1/20130425.015604 submit/tizen/20130530.175731 submit/tizen/20130605.214039 submit/tizen/20130606.194143 submit/tizen_2.1/20130424.222714
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:03:15 +0000 (01:03 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:03:15 +0000 (01:03 +0900)
CMakeLists.txt
src/test/slp_plugin_test.c

index d125783..1538bf1 100644 (file)
@@ -17,7 +17,7 @@ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED devman_plugin alsa dlog iniparser svi)
+pkg_check_modules(pkgs REQUIRED devman devman_plugin alsa dlog iniparser svi)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
index 09360c3..b7e0c67 100644 (file)
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <devman/devman_plugin_intf.h>
-#include <devman/devman.h>
+#include <devman_plugin_intf.h>
+#include <devman.h>
 #include <svi.h>
 
 #define TEST_GET(_func, _value) {\