From 8d3370d33528935d8804f13401753afd492c5ffa Mon Sep 17 00:00:00 2001 From: Gwanglim Lee Date: Mon, 23 Oct 2017 17:33:34 +0900 Subject: [PATCH] moved extended protocol files to the tizen directory Change-Id: Ief5d9df7841bbc7d6985976db61c00f1d6320aa3 --- Makefile.am | 96 +++++++++---------- protocol/{ => tizen}/fullscreen-shell.xml | 0 protocol/{ => tizen}/input-method.xml | 0 protocol/{ => tizen}/scaler.xml | 0 protocol/{ => tizen}/screenshooter.xml | 0 protocol/{ => tizen}/text-cursor-position.xml | 0 protocol/{ => tizen}/text.xml | 0 protocol/{ => tizen}/tizen-extension.xml | 0 protocol/{ => tizen}/tizen-launch.xml | 0 protocol/{ => tizen}/tizen-remote-surface.xml | 0 protocol/{ => tizen}/tizen-surface.xml | 0 protocol/{ => tizen}/transform.xml | 0 protocol/{ => tizen}/xdg-shell.xml | 0 13 files changed, 48 insertions(+), 48 deletions(-) rename protocol/{ => tizen}/fullscreen-shell.xml (100%) rename protocol/{ => tizen}/input-method.xml (100%) rename protocol/{ => tizen}/scaler.xml (100%) rename protocol/{ => tizen}/screenshooter.xml (100%) rename protocol/{ => tizen}/text-cursor-position.xml (100%) rename protocol/{ => tizen}/text.xml (100%) rename protocol/{ => tizen}/tizen-extension.xml (100%) rename protocol/{ => tizen}/tizen-launch.xml (100%) rename protocol/{ => tizen}/tizen-remote-surface.xml (100%) rename protocol/{ => tizen}/tizen-surface.xml (100%) rename protocol/{ => tizen}/transform.xml (100%) rename protocol/{ => tizen}/xdg-shell.xml (100%) diff --git a/Makefile.am b/Makefile.am index 8cb6d71..5244c25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_builddir)/protocol -I$(top_srcdir)/src +INCLUDES = -I$(top_builddir)/protocol/tizen -I$(top_srcdir)/src pkgconfigdir = $(libdir)/pkgconfig protocoldir = $(libdir) @@ -9,11 +9,11 @@ protocolinclude_HEADERS = src/wayland-extension-version.h protocol_LTLIBRARIES = ### protocol.[ch] -protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml +protocol/tizen/%-protocol.c : $(top_srcdir)/protocol/tizen/%.xml $(wayland_scanner) code < $< > $@ -protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml +protocol/tizen/%-server-protocol.h : $(top_srcdir)/protocol/tizen/%.xml $(wayland_scanner) server-header < $< > $@ -protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml +protocol/tizen/%-client-protocol.h : $(top_srcdir)/protocol/tizen/%.xml $(wayland_scanner) client-header < $< > $@ ### protocol.pc @@ -30,12 +30,12 @@ pkgconfig_DATA += \ src/xdg-shell-server.pc \ src/xdg-shell-client.pc protocolinclude_HEADERS += \ - protocol/xdg-shell-server-protocol.h \ - protocol/xdg-shell-client-protocol.h -libxdg_shell_server_la_SOURCES = protocol/xdg-shell-protocol.c + protocol/tizen/xdg-shell-server-protocol.h \ + protocol/tizen/xdg-shell-client-protocol.h +libxdg_shell_server_la_SOURCES = protocol/tizen/xdg-shell-protocol.c libxdg_shell_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libxdg_shell_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libxdg_shell_client_la_SOURCES = protocol/xdg-shell-protocol.c +libxdg_shell_client_la_SOURCES = protocol/tizen/xdg-shell-protocol.c libxdg_shell_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libxdg_shell_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -47,12 +47,12 @@ pkgconfig_DATA += \ src/input-method-server.pc \ src/input-method-client.pc protocolinclude_HEADERS += \ - protocol/input-method-server-protocol.h \ - protocol/input-method-client-protocol.h -libinput_method_server_la_SOURCES = protocol/input-method-protocol.c + protocol/tizen/input-method-server-protocol.h \ + protocol/tizen/input-method-client-protocol.h +libinput_method_server_la_SOURCES = protocol/tizen/input-method-protocol.c libinput_method_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libinput_method_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libinput_method_client_la_SOURCES = protocol/input-method-protocol.c +libinput_method_client_la_SOURCES = protocol/tizen/input-method-protocol.c libinput_method_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libinput_method_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -64,12 +64,12 @@ pkgconfig_DATA += \ src/fullscreen-shell-server.pc \ src/fullscreen-shell-client.pc protocolinclude_HEADERS += \ - protocol/fullscreen-shell-server-protocol.h \ - protocol/fullscreen-shell-client-protocol.h -libfullscreen_shell_server_la_SOURCES = protocol/fullscreen-shell-protocol.c + protocol/tizen/fullscreen-shell-server-protocol.h \ + protocol/tizen/fullscreen-shell-client-protocol.h +libfullscreen_shell_server_la_SOURCES = protocol/tizen/fullscreen-shell-protocol.c libfullscreen_shell_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libfullscreen_shell_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libfullscreen_shell_client_la_SOURCES = protocol/fullscreen-shell-protocol.c +libfullscreen_shell_client_la_SOURCES = protocol/tizen/fullscreen-shell-protocol.c libfullscreen_shell_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libfullscreen_shell_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -81,12 +81,12 @@ pkgconfig_DATA += \ src/scaler-server.pc \ src/scaler-client.pc protocolinclude_HEADERS += \ - protocol/scaler-server-protocol.h \ - protocol/scaler-client-protocol.h -libscaler_server_la_SOURCES = protocol/scaler-protocol.c + protocol/tizen/scaler-server-protocol.h \ + protocol/tizen/scaler-client-protocol.h +libscaler_server_la_SOURCES = protocol/tizen/scaler-protocol.c libscaler_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libscaler_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libscaler_client_la_SOURCES = protocol/scaler-protocol.c +libscaler_client_la_SOURCES = protocol/tizen/scaler-protocol.c libscaler_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libscaler_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -98,12 +98,12 @@ pkgconfig_DATA += \ src/transform-server.pc \ src/transform-client.pc protocolinclude_HEADERS += \ - protocol/transform-server-protocol.h \ - protocol/transform-client-protocol.h -libtransform_server_la_SOURCES = protocol/transform-protocol.c + protocol/tizen/transform-server-protocol.h \ + protocol/tizen/transform-client-protocol.h +libtransform_server_la_SOURCES = protocol/tizen/transform-protocol.c libtransform_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libtransform_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libtransform_client_la_SOURCES = protocol/transform-protocol.c +libtransform_client_la_SOURCES = protocol/tizen/transform-protocol.c libtransform_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libtransform_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -115,12 +115,12 @@ pkgconfig_DATA += \ src/screenshooter-server.pc \ src/screenshooter-client.pc protocolinclude_HEADERS += \ - protocol/screenshooter-server-protocol.h \ - protocol/screenshooter-client-protocol.h -libscreenshooter_server_la_SOURCES = protocol/screenshooter-protocol.c + protocol/tizen/screenshooter-server-protocol.h \ + protocol/tizen/screenshooter-client-protocol.h +libscreenshooter_server_la_SOURCES = protocol/tizen/screenshooter-protocol.c libscreenshooter_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libscreenshooter_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libscreenshooter_client_la_SOURCES = protocol/screenshooter-protocol.c +libscreenshooter_client_la_SOURCES = protocol/tizen/screenshooter-protocol.c libscreenshooter_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libscreenshooter_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -132,12 +132,12 @@ pkgconfig_DATA += \ src/text-cursor-position-server.pc \ src/text-cursor-position-client.pc protocolinclude_HEADERS += \ - protocol/text-cursor-position-server-protocol.h \ - protocol/text-cursor-position-client-protocol.h -libtext_cursor_position_server_la_SOURCES = protocol/text-cursor-position-protocol.c + protocol/tizen/text-cursor-position-server-protocol.h \ + protocol/tizen/text-cursor-position-client-protocol.h +libtext_cursor_position_server_la_SOURCES = protocol/tizen/text-cursor-position-protocol.c libtext_cursor_position_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libtext_cursor_position_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libtext_cursor_position_client_la_SOURCES = protocol/text-cursor-position-protocol.c +libtext_cursor_position_client_la_SOURCES = protocol/tizen/text-cursor-position-protocol.c libtext_cursor_position_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libtext_cursor_position_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -149,12 +149,12 @@ pkgconfig_DATA += \ src/text-server.pc \ src/text-client.pc protocolinclude_HEADERS += \ - protocol/text-server-protocol.h \ - protocol/text-client-protocol.h -libtext_server_la_SOURCES = protocol/text-protocol.c + protocol/tizen/text-server-protocol.h \ + protocol/tizen/text-client-protocol.h +libtext_server_la_SOURCES = protocol/tizen/text-protocol.c libtext_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libtext_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libtext_client_la_SOURCES = protocol/text-protocol.c +libtext_client_la_SOURCES = protocol/tizen/text-protocol.c libtext_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libtext_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -166,12 +166,12 @@ pkgconfig_DATA += \ src/tizen-extension-server.pc \ src/tizen-extension-client.pc protocolinclude_HEADERS += \ - protocol/tizen-extension-server-protocol.h \ - protocol/tizen-extension-client-protocol.h -libtizen_extension_server_la_SOURCES = protocol/tizen-extension-protocol.c + protocol/tizen/tizen-extension-server-protocol.h \ + protocol/tizen/tizen-extension-client-protocol.h +libtizen_extension_server_la_SOURCES = protocol/tizen/tizen-extension-protocol.c libtizen_extension_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libtizen_extension_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libtizen_extension_client_la_SOURCES = protocol/tizen-extension-protocol.c +libtizen_extension_client_la_SOURCES = protocol/tizen/tizen-extension-protocol.c libtizen_extension_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libtizen_extension_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -183,12 +183,12 @@ pkgconfig_DATA += \ src/tizen-remote-surface-server.pc \ src/tizen-remote-surface-client.pc protocolinclude_HEADERS += \ - protocol/tizen-remote-surface-server-protocol.h \ - protocol/tizen-remote-surface-client-protocol.h -libtizen_remote_surface_server_la_SOURCES = protocol/tizen-remote-surface-protocol.c + protocol/tizen/tizen-remote-surface-server-protocol.h \ + protocol/tizen/tizen-remote-surface-client-protocol.h +libtizen_remote_surface_server_la_SOURCES = protocol/tizen/tizen-remote-surface-protocol.c libtizen_remote_surface_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libtizen_remote_surface_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libtizen_remote_surface_client_la_SOURCES = protocol/tizen-remote-surface-protocol.c +libtizen_remote_surface_client_la_SOURCES = protocol/tizen/tizen-remote-surface-protocol.c libtizen_remote_surface_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libtizen_remote_surface_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ @@ -200,12 +200,12 @@ pkgconfig_DATA += \ src/tizen-launch-server.pc \ src/tizen-launch-client.pc protocolinclude_HEADERS += \ - protocol/tizen-launch-server-protocol.h \ - protocol/tizen-launch-client-protocol.h -libtizen_launch_server_la_SOURCES = protocol/tizen-launch-protocol.c + protocol/tizen/tizen-launch-server-protocol.h \ + protocol/tizen/tizen-launch-client-protocol.h +libtizen_launch_server_la_SOURCES = protocol/tizen/tizen-launch-protocol.c libtizen_launch_server_la_CFLAGS = @WAYLAND_SERVER_CFLAGS@ libtizen_launch_server_la_LIBADD = @WAYLAND_SERVER_LIBS@ -libtizen_launch_client_la_SOURCES = protocol/tizen-launch-protocol.c +libtizen_launch_client_la_SOURCES = protocol/tizen/tizen-launch-protocol.c libtizen_launch_client_la_CFLAGS = @WAYLAND_CLIENT_CFLAGS@ libtizen_launch_client_la_LIBADD = @WAYLAND_CLIENT_LIBS@ diff --git a/protocol/fullscreen-shell.xml b/protocol/tizen/fullscreen-shell.xml similarity index 100% rename from protocol/fullscreen-shell.xml rename to protocol/tizen/fullscreen-shell.xml diff --git a/protocol/input-method.xml b/protocol/tizen/input-method.xml similarity index 100% rename from protocol/input-method.xml rename to protocol/tizen/input-method.xml diff --git a/protocol/scaler.xml b/protocol/tizen/scaler.xml similarity index 100% rename from protocol/scaler.xml rename to protocol/tizen/scaler.xml diff --git a/protocol/screenshooter.xml b/protocol/tizen/screenshooter.xml similarity index 100% rename from protocol/screenshooter.xml rename to protocol/tizen/screenshooter.xml diff --git a/protocol/text-cursor-position.xml b/protocol/tizen/text-cursor-position.xml similarity index 100% rename from protocol/text-cursor-position.xml rename to protocol/tizen/text-cursor-position.xml diff --git a/protocol/text.xml b/protocol/tizen/text.xml similarity index 100% rename from protocol/text.xml rename to protocol/tizen/text.xml diff --git a/protocol/tizen-extension.xml b/protocol/tizen/tizen-extension.xml similarity index 100% rename from protocol/tizen-extension.xml rename to protocol/tizen/tizen-extension.xml diff --git a/protocol/tizen-launch.xml b/protocol/tizen/tizen-launch.xml similarity index 100% rename from protocol/tizen-launch.xml rename to protocol/tizen/tizen-launch.xml diff --git a/protocol/tizen-remote-surface.xml b/protocol/tizen/tizen-remote-surface.xml similarity index 100% rename from protocol/tizen-remote-surface.xml rename to protocol/tizen/tizen-remote-surface.xml diff --git a/protocol/tizen-surface.xml b/protocol/tizen/tizen-surface.xml similarity index 100% rename from protocol/tizen-surface.xml rename to protocol/tizen/tizen-surface.xml diff --git a/protocol/transform.xml b/protocol/tizen/transform.xml similarity index 100% rename from protocol/transform.xml rename to protocol/tizen/transform.xml diff --git a/protocol/xdg-shell.xml b/protocol/tizen/xdg-shell.xml similarity index 100% rename from protocol/xdg-shell.xml rename to protocol/tizen/xdg-shell.xml -- 2.34.1