Move libweston-desktop into libweston

It's not really useful to have libweston without libweston-desktop. It's
also very little code.

Merging both into the same DSO will allow us to cut out a bunch of
indirection and pain.

Signed-off-by: Daniel Stone <daniels@collabora.com>

desktop-shell/meson.build

@@ -13,7 +13,6 @@ if get_option('shell-desktop')
 		dep_libm,
 		dep_libexec_weston,
 		dep_libshared,
-		dep_lib_desktop,
 		dep_libweston_public,
 		dep_shell_utils,
 	]

ivi-shell/meson.build

@@ -15,7 +15,6 @@ if get_option('shell-ivi')
 		dependencies: [
 			dep_libm,
 			dep_libexec_weston,
-			dep_lib_desktop,
 			dep_libweston_public
 		],
 		name_prefix: '',

kiosk-shell/meson.build

@@ -9,7 +9,6 @@ if get_option('shell-kiosk')
 		dep_libm,
 		dep_libexec_weston,
 		dep_libshared,
-		dep_lib_desktop,
 		dep_libweston_public,
 		dep_shell_utils,
 	]

libweston-desktop/meson.build

@@ -1,35 +0,0 @@
-srcs_libdesktop = [
-	'libweston-desktop.c',
-	'client.c',
-	'seat.c',
-	'surface.c',
-	'xwayland.c',
-	'xdg-shell.c',
-	'xdg-shell-v6.c',
-	xdg_shell_unstable_v6_server_protocol_h,
-	xdg_shell_unstable_v6_protocol_c,
-	xdg_shell_server_protocol_h,
-	xdg_shell_protocol_c,
-]
-lib_desktop = shared_library(
-	'weston-desktop-@0@'.format(libweston_major),
-	srcs_libdesktop,
-	include_directories: common_inc,
-	install: true,
-	version: '0.0.@0@'.format(libweston_revision),
-	dependencies: dep_libweston_public
-)
-dep_lib_desktop = declare_dependency(
-	link_with: lib_desktop,
-	dependencies: dep_libweston_public
-)
-
-pkgconfig.generate(
-	lib_desktop,
-	filebase: 'libweston-desktop-@0@'.format(libweston_major),
-	name: 'libweston-desktop',
-	version: version_weston,
-	description: 'Desktop shells abstraction library for libweston compositors',
-	requires_private: [ lib_weston, dep_wayland_server ],
-	subdirs: dir_include_libweston
-)

libweston/desktop/meson.build

@@ -0,0 +1,16 @@
+srcs_libweston += files([
+	'libweston-desktop.c',
+	'client.c',
+	'seat.c',
+	'surface.c',
+	'xwayland.c',
+	'xdg-shell.c',
+	'xdg-shell-v6.c',
+])
+
+srcs_libweston += [
+	xdg_shell_unstable_v6_server_protocol_h,
+	xdg_shell_unstable_v6_protocol_c,
+	xdg_shell_server_protocol_h,
+	xdg_shell_protocol_c,
+]

libweston/meson.build

@@ -69,6 +69,8 @@ srcs_libweston = [
 	weston_direct_display_server_protocol_h,
 ]
 
+subdir('desktop')
+
 if get_option('renderer-gl')
 	dep_egl = dependency('egl', required: false)
 	if not dep_egl.found()
@@ -130,6 +132,20 @@ pkgconfig.generate(
 	subdirs: dir_include_libweston
 )
 
+if version_weston.version_compare('>= 11.0.90')
+	error('Remove libweston-desktop.pc for Weston 12.x')
+endif
+
+pkgconfig.generate(
+	lib_weston,
+	filebase: 'libweston-desktop-@0@'.format(libweston_major),
+	name: 'libweston-desktop',
+	version: version_weston,
+	description: 'Desktop shell abstraction library for libweston compositors',
+	requires_private: deps_for_libweston_users,
+	subdirs: dir_include_libweston
+)
+
 pkgconfig.generate(
 	filebase: 'libweston-@0@-protocols'.format(libweston_major),
 	name: 'libWeston Protocols',

meson.build

@@ -162,7 +162,6 @@ subdir('include')
 subdir('protocol')
 subdir('shared')
 subdir('libweston')
-subdir('libweston-desktop')
 subdir('xwayland')
 subdir('shell-utils')
 subdir('compositor')

shell-utils/meson.build

@@ -1,5 +1,5 @@
 dep_shell_utils = declare_dependency(
         sources: 'shell-utils.c',
         include_directories: include_directories('.'),
-        dependencies: dep_lib_desktop
+        dependencies: dep_libweston_public,
 )

tests/meson.build

@@ -2,7 +2,7 @@ plugin_test_shell_desktop = shared_library(
 	'weston-test-desktop-shell',
 	'weston-test-desktop-shell.c',
 	include_directories: common_inc,
-	dependencies: [ dep_lib_desktop, dep_libweston_public, dep_libexec_weston, dep_shell_utils ],
+	dependencies: [ dep_libweston_public, dep_libexec_weston, dep_shell_utils ],
 	name_prefix: '',
 	install: false
 )
@@ -241,7 +241,7 @@ tests = [
 		'sources': [
 		  'safe-signal-output-removal-test.c',
 		],
-		'dep_objs': [ dep_lib_desktop, dep_shell_utils ]
+		'dep_objs': [ dep_shell_utils ]
 	},
 ]