[Meson/CustomFilter] change install path

install custom-filter examples into {subplugin_install_prefix}/customfilters

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/meson.build b/meson.build
index c37dfd2..ace3779 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -37,6 +37,7 @@ examples_install_dir = nnstreamer_bindir
 
 # nnstreamer sub-plugins path
 subplugin_install_prefix = join_paths(nnstreamer_prefix, 'lib', 'nnstreamer')
+customfilter_install_dir = join_paths(subplugin_install_prefix, 'customfilters')
 
 nnstreamer_conf.set('PREFIX', nnstreamer_prefix)
 nnstreamer_conf.set('EXEC_PREFIX', nnstreamer_bindir)

diff --git a/nnstreamer_example/custom_example_LSTM/meson.build b/nnstreamer_example/custom_example_LSTM/meson.build
index a9165dc..ed7519f 100644 (file)
--- a/nnstreamer_example/custom_example_LSTM/meson.build
+++ b/nnstreamer_example/custom_example_LSTM/meson.build
@@ -1,7 +1,7 @@
-dummyLSTM = shared_library('dummyLSTM',
+library('dummyLSTM',
   'dummy_LSTM.c',
   dependencies: [libm_dep],
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )

diff --git a/nnstreamer_example/custom_example_RNN/meson.build b/nnstreamer_example/custom_example_RNN/meson.build
index 4fefd28..a35c1e2 100644 (file)
--- a/nnstreamer_example/custom_example_RNN/meson.build
+++ b/nnstreamer_example/custom_example_RNN/meson.build
@@ -1,6 +1,6 @@
-dummyRNN = shared_library('dummyRNN',
+library('dummyRNN',
   'dummy_RNN.c',
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )

diff --git a/nnstreamer_example/custom_example_average/meson.build b/nnstreamer_example/custom_example_average/meson.build
index 46cba3a..6c94958 100644 (file)
--- a/nnstreamer_example/custom_example_average/meson.build
+++ b/nnstreamer_example/custom_example_average/meson.build
@@ -1,6 +1,6 @@
-nnstreamer_customfilter_average = shared_library('nnstreamer_customfilter_average',
+library('nnstreamer_customfilter_average',
   'nnstreamer_customfilter_example_average.c',
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )

diff --git a/nnstreamer_example/custom_example_opencv/meson.build b/nnstreamer_example/custom_example_opencv/meson.build
index 49ff2ba..df9a121 100644 (file)
--- a/nnstreamer_example/custom_example_opencv/meson.build
+++ b/nnstreamer_example/custom_example_opencv/meson.build
@@ -1,17 +1,17 @@
 opencv_dep = dependency('opencv')
 
-nnstreamer_customfilter_opencv_scaler = shared_library('nnstreamer_customfilter_opencv_scaler',
+library('nnstreamer_customfilter_opencv_scaler',
   'nnstreamer_customfilter_opencv_scaler.cc',
   dependencies: [glib_dep, opencv_dep],
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )
 
-nnstreamer_customfilter_opencv_average = shared_library('nnstreamer_customfilter_opencv_average',
+library('nnstreamer_customfilter_opencv_average',
   'nnstreamer_customfilter_opencv_average.cc',
   dependencies: [glib_dep, opencv_dep],
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )

diff --git a/nnstreamer_example/custom_example_passthrough/meson.build b/nnstreamer_example/custom_example_passthrough/meson.build
index 4b326c8..b4490e8 100644 (file)
--- a/nnstreamer_example/custom_example_passthrough/meson.build
+++ b/nnstreamer_example/custom_example_passthrough/meson.build
@@ -1,13 +1,13 @@
-nnstreamer_customfilter_passthrough = shared_library('nnstreamer_customfilter_passthrough',
+library('nnstreamer_customfilter_passthrough',
   'nnstreamer_customfilter_example_passthrough.c',
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )
 
-nnstreamer_customfilter_passthrough_variable = shared_library('nnstreamer_customfilter_passthrough_variable',
+library('nnstreamer_customfilter_passthrough_variable',
   'nnstreamer_customfilter_example_passthrough_variable.c',
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )

diff --git a/nnstreamer_example/custom_example_scaler/meson.build b/nnstreamer_example/custom_example_scaler/meson.build
index a4e1076..45e9b81 100644 (file)
--- a/nnstreamer_example/custom_example_scaler/meson.build
+++ b/nnstreamer_example/custom_example_scaler/meson.build
@@ -1,15 +1,15 @@
-nnstreamer_customfilter_scaler = shared_library('nnstreamer_customfilter_scaler',
+library('nnstreamer_customfilter_scaler',
   'nnstreamer_customfilter_example_scaler.c',
   dependencies: [glib_dep],
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )
 
-nnstreamer_customfilter_scaler_allocator = shared_library('nnstreamer_customfilter_scaler_allocator',
+library('nnstreamer_customfilter_scaler_allocator',
   'nnstreamer_customfilter_example_scaler_allocator.c',
   dependencies: [glib_dep],
   include_directories: nnstreamer_inc,
   install: get_option('install-example'),
-  install_dir: subplugins_install_dir
+  install_dir: customfilter_install_dir
 )

diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index 9ffdec8..b799131 100644 (file)
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -179,8 +179,7 @@ cp -r result %{buildroot}%{_datadir}/nnstreamer/unittest/
 %manifest nnstreamer.manifest
 %defattr(-,root,root,-)
 %license LICENSE
-%{_libdir}/*.so
-%exclude %{_libdir}/libtensor_filter_*.so
+%{_prefix}/lib/nnstreamer/customfilters/*.so
 
 %changelog
 * Thu Jan 24 2019 MyungJoo Ham <myungjoo.ham@samsung.com>