api: clean up dependencies

Remove unnecessary dependencies.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/api/capi/include/nntrainer.h b/api/capi/include/nntrainer.h
index 22a2323..43f6e4d 100644 (file)
--- a/api/capi/include/nntrainer.h
+++ b/api/capi/include/nntrainer.h
@@ -29,7 +29,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include <ml-api-common.h>
 #include <nnstreamer.h>
 #include <nntrainer-api-common.h>
 

diff --git a/api/capi/meson.build b/api/capi/meson.build
index 147f103..eaf224a 100644 (file)
--- a/api/capi/meson.build
+++ b/api/capi/meson.build
@@ -9,7 +9,7 @@ capi_inc_abs = [
 capi_src = []
 capi_src += meson.current_source_dir() / 'src' / 'nntrainer.cpp'
 
-if not nnstreamer_capi_dep.found() and get_option('platform') != 'android'
+if not nnstreamer_capi_dep.found() and get_option('platform') == 'tizen'
   error('nnstreamer capi dependency not found for tizen')
 endif
 

diff --git a/api/ccapi/include/layer.h b/api/ccapi/include/layer.h
index 1907a20..d2fd89f 100644 (file)
--- a/api/ccapi/include/layer.h
+++ b/api/ccapi/include/layer.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 
-#include <ml-api-common.h>
 #include <nntrainer-api-common.h>
 
 namespace ml {

diff --git a/api/ccapi/include/optimizer.h b/api/ccapi/include/optimizer.h
index bb56e73..011b9f8 100644 (file)
--- a/api/ccapi/include/optimizer.h
+++ b/api/ccapi/include/optimizer.h
@@ -21,7 +21,6 @@
 #include <string>
 #include <vector>
 
-#include <ml-api-common.h>
 #include <nntrainer-api-common.h>
 
 namespace ml {

diff --git a/api/meson.build b/api/meson.build
index 41b7440..d170d5c 100644 (file)
--- a/api/meson.build
+++ b/api/meson.build
@@ -1,10 +1,15 @@
 if get_option('enable-ccapi')
+  enable_ccapi = true
   subdir('ccapi')
 endif
 
-if get_option('enable-capi')
+if get_option('enable-capi').enabled()
   if not get_option('enable-ccapi')
     error('enable-ccapi must be set for capi as well')
   endif
+  enable_capi = true
+  subdir('capi')
+elif get_option('enable-capi').auto() and get_option('enable-ccapi') and nnstreamer_capi_dep.found()
+  enable_capi = true
   subdir('capi')
 endif