Donot make libds-tizen package

Remove libds-tizen/libds-tizen-devel packages and libds-tizen library

Change-Id: Id66b15da9fe591eb7dc249c7e9faa78205458aae

diff --git a/examples/meson.build b/examples/meson.build
index 56fcd61..21b6ef9 100644 (file)
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,5 +1,5 @@
 common_deps = [
-  dep_libds_tizen,
+  deps_libds_tizen,
   dependency('pixman-1', required: true),
   dependency('wayland-server', required: true),
 ]

diff --git a/packaging/libds-tizen.spec b/packaging/libds-tizen.spec
index cf44015..f2702ee 100644 (file)
--- a/packaging/libds-tizen.spec
+++ b/packaging/libds-tizen.spec
@@ -31,14 +31,6 @@ BuildRequires:  pkgconfig(libsmack)
 %description
 Wayland Compositor Library for Tizen
 
-%package devel
-Summary:    Wayland Compositor Library for Tizen
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description devel
-Development package of Wayland Compositor Library for Tizen
-
 ## libds-tizen-allocator-tbm
 %package allocator-tbm
 Summary: Allocator Library with TBM
@@ -146,26 +138,6 @@ ninja -C builddir all
 export DESTDIR=%{buildroot}
 ninja -C builddir install
 
-%files
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%license LICENSE
-%{_libdir}/libds-tizen.so.*
-
-%files devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%license LICENSE
-%{_includedir}/libds-tizen/*
-%{_libdir}/pkgconfig/libds-tizen.pc
-%{_libdir}/libds-tizen.so
-%{_bindir}/tdm-backend
-%{_bindir}/tinyds-tdm
-%{_bindir}/tinyds-tdm-hwc
-%{_bindir}/ds-simple-tbm
-%{_bindir}/tinyds-tdm-libinput
-%{_bindir}/input-generator
-
 %files allocator-tbm
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
@@ -194,6 +166,10 @@ ninja -C builddir install
 %{_includedir}/libds-tizen/backend/tdm_output_hwc.h
 %{_libdir}/pkgconfig/libds-tizen-backend-tdm.pc
 %{_libdir}/libds-tizen-backend-tdm.so
+%{_bindir}/tdm-backend
+%{_bindir}/tinyds-tdm
+%{_bindir}/tinyds-tdm-hwc
+%{_bindir}/ds-simple-tbm
 
 %files tbm-server
 %manifest %{name}.manifest

diff --git a/src/allocator/tbm/meson.build b/src/allocator/tbm/meson.build
index b2ee630..8a6b882 100644 (file)
--- a/src/allocator/tbm/meson.build
+++ b/src/allocator/tbm/meson.build
@@ -3,7 +3,7 @@ libds_tizen_allocator_tbm_files = files(
 )
 
 libds_tizen_allocator_tbm_deps = [
-  dep_libds_tizen,
+  deps_libds_tizen,
   dependency('libtbm', required: true)
 ]
 

diff --git a/src/backend/tdm/meson.build b/src/backend/tdm/meson.build
index bca5bca..131a2f3 100644 (file)
--- a/src/backend/tdm/meson.build
+++ b/src/backend/tdm/meson.build
@@ -6,7 +6,7 @@ libds_tizen_backend_tdm_files = files(
 )
 
 libds_tizen_backend_tdm_deps = [
-  dep_libds_tizen,
+  deps_libds_tizen,
   dep_libds_tizen_allocator_tbm,
   dep_libds_tizen_tbm_server,
   dependency('libtdm', required: true),

diff --git a/src/dpms/meson.build b/src/dpms/meson.build
index 2de950f..61ff9f5 100644 (file)
--- a/src/dpms/meson.build
+++ b/src/dpms/meson.build
@@ -3,7 +3,7 @@ libds_tizen_dpms_files = [
 ]
 
 libds_tizen_dpms_deps = [
-  dep_libds_tizen,
+  deps_libds_tizen,
   dependency('tizen-dpms-server', required: true),
 ]
 

diff --git a/src/input-devicemgr/meson.build b/src/input-devicemgr/meson.build
index 1e69463..dcf898c 100644 (file)
--- a/src/input-devicemgr/meson.build
+++ b/src/input-devicemgr/meson.build
@@ -4,7 +4,7 @@ libds_tizen_input_devicemgr_files = [
 ]
 
 libds_tizen_input_devicemgr_deps = [
-  dep_libds_tizen,
+  deps_libds_tizen,
   deps_tizen_security,
   dependency('tizen-extension-server', required: true),
 ]

diff --git a/src/keyrouter/meson.build b/src/keyrouter/meson.build
index af235ce..6f49792 100644 (file)
--- a/src/keyrouter/meson.build
+++ b/src/keyrouter/meson.build
@@ -5,7 +5,7 @@ libds_tizen_keyrouter_files = [
 ]
 
 libds_tizen_keyrouter_deps = [
-  dep_libds_tizen,
+  deps_libds_tizen,
   deps_tizen_security,
   dependency('tizen-extension-server', required: true),
 ]

diff --git a/src/meson.build b/src/meson.build
index 4d8a290..a77f291 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,3 @@
-libds_tizen_files = [
-]
-
 math = meson.get_compiler('c').find_library('m')
 wayland_server = dependency('wayland-server', required: true)
 rt = meson.get_compiler('c').find_library('rt')
@@ -12,13 +9,13 @@ endif
 
 base_deps = [
   math,
-  wayland_server,
   xkbcommon,
   rt,
 ]
 
-libds_tizen_deps = [
+deps_libds_tizen = [
   base_deps,
+  wayland_server,
   dependency('libds', required: true),
 ]
 
@@ -33,27 +30,6 @@ deps_tizen_security = [
   dependency('libsmack', required: true)
 ]
 
-lib_libds_tizen = shared_library('ds-tizen', libds_tizen_files,
-  dependencies: libds_tizen_deps,
-  include_directories: [ common_inc, include_directories('.') ],
-  version: meson.project_version(),
-  install: true
-)
-
-dep_libds_tizen = declare_dependency(
-  link_with: lib_libds_tizen,
-  dependencies: libds_tizen_deps,
-  include_directories: [ common_inc, include_directories('.') ],
-)
-
-pkgconfig = import('pkgconfig')
-pkgconfig.generate(lib_libds_tizen,
-  version: meson.project_version(),
-  filebase: 'libds-tizen',
-  name: 'libds-tizen',
-  description: 'extension of libds for tizen platform',
-)
-
 subdir('allocator')
 subdir('tbm-server')
 subdir('backend')

diff --git a/src/tbm-server/meson.build b/src/tbm-server/meson.build
index c83ff6c..25f186e 100644 (file)
--- a/src/tbm-server/meson.build
+++ b/src/tbm-server/meson.build
@@ -4,7 +4,7 @@ libds_tizen_tbm_server_files = [
 ]
 
 libds_tizen_tbm_server_deps = [
-  dep_libds_tizen,
+  deps_libds_tizen,
   dependency('libdrm', required: true),
   dependency('libtbm', required: true),
   dependency('wayland-tbm-server', required: true),

diff --git a/tests/meson.build b/tests/meson.build
index 19f1e1d..dae7875 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -12,7 +12,7 @@ tests = [
 ]
 
 foreach t : tests
-  t_deps = [ dep_libds_tizen ]
+  t_deps = [ deps_libds_tizen ]
   t_deps += t.get('deps', [])
 
   test('libds-tizen-' + t.get('name'),