Remove unnecessary options

Change-Id: I605e843c10f982d20c64d8d6a1049b2c86526143

diff --git a/meson.build b/meson.build
index 7317317..2acd5fb 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -246,12 +246,6 @@ elif cc.get_argument_syntax() == 'msvc'
     libxkbcommon_link_args += '/DEF:' + libxkbcommon_def.full_path()
 endif
 
-## For tizen profile ##
-tizen_profile = get_option('tizen-profile')
-if tizen_profile == 'common'
-       libxkbcommon_link_args += '-D_F_TIZEN_COMMON_PROFILE_'
-endif
-
 libxkbcommon = library(
     'xkbcommon',
     'include/xkbcommon/xkbcommon.h',

diff --git a/meson_options.txt b/meson_options.txt
index eb1314b..3186ada 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -90,10 +90,4 @@ option(
     value: true,
     description: 'Enable installing bash completion scripts',
 )
-option(
-    'tizen-profile',
-    type: 'string',
-    value: 'common',
-    description: 'Enable support for Wayland utility programs',
-)
 

diff --git a/packaging/libxkbcommon.spec b/packaging/libxkbcommon.spec
index 24edb6f..bfd781f 100644 (file)
--- a/packaging/libxkbcommon.spec
+++ b/packaging/libxkbcommon.spec
@@ -46,7 +46,7 @@ chmod a+x ./gen_tables.sh
 ./gen_tables.sh
 
 %build
-%autogen --disable-static --disable-x11"
+%autogen --disable-static --disable-x11
 %__make %{?_smp_mflags} V=1;
 
 %install

diff --git a/xkbcommon-uninstalled.pc.in b/xkbcommon-uninstalled.pc.in
index 789c2fe..d4d6a2b 100644 (file)
--- a/xkbcommon-uninstalled.pc.in
+++ b/xkbcommon-uninstalled.pc.in
@@ -4,5 +4,5 @@ includedir=@abs_top_srcdir@
 Name: xkbcommon
 Description: XKB API common to servers and clients (uninstalled)
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @TIZEN_COMMON_CFLAGS@
+Cflags: -I${includedir}
 Libs: -L${libdir} -lxkbcommon

diff --git a/xkbcommon-x11-uninstalled.pc.in b/xkbcommon-x11-uninstalled.pc.in
index 0c64dfe..d99ca49 100644 (file)
--- a/xkbcommon-x11-uninstalled.pc.in
+++ b/xkbcommon-x11-uninstalled.pc.in
@@ -6,5 +6,5 @@ Description: XKB API common to servers and clients - X11 support (uninstalled)
 Version: @PACKAGE_VERSION@
 Requires: xkbcommon
 Requires.private: xcb xcb-xkb
-Cflags: -I${includedir} @TIZEN_COMMON_CFLAGS@
+Cflags: -I${includedir}
 Libs: -L${libdir} -lxkbcommon-x11

diff --git a/xkbcommon-x11.pc.in b/xkbcommon-x11.pc.in
index 922f35a..c4efc43 100644 (file)
--- a/xkbcommon-x11.pc.in
+++ b/xkbcommon-x11.pc.in
@@ -8,5 +8,5 @@ Description: XKB API common to servers and clients - X11 support
 Version: @PACKAGE_VERSION@
 Requires: xkbcommon
 Requires.private: xcb xcb-xkb
-Cflags: -I${includedir} @TIZEN_COMMON_CFLAGS@
+Cflags: -I${includedir}
 Libs: -L${libdir} -lxkbcommon-x11

diff --git a/xkbcommon.pc.in b/xkbcommon.pc.in
index 2e9a8bd..17e1172 100644 (file)
--- a/xkbcommon.pc.in
+++ b/xkbcommon.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: xkbcommon
 Description: XKB API common to servers and clients
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @TIZEN_COMMON_CFLAGS@
+Cflags: -I${includedir}
 Libs: -L${libdir} -lxkbcommon