diff options
| author | Sung-Jin Park <sj76.park@samsung.com> | 2017-10-20 16:41:44 +0900 |
|---|---|---|
| committer | jeon <jhyuni.kang@samsung.com> | 2020-02-20 20:31:06 +0900 |
| commit | 4b654a1221de4b3e77af2a079061505bbb899376 (patch) | |
| tree | eca3520316c8dedf68d01235a8106acf18a15cc7 | |
| parent | 75df4b2759c7cf234e7e7c15f48dcfbb9224650a (diff) | |
| download | libxkbcommon-4b654a1221de4b3e77af2a079061505bbb899376.tar.gz libxkbcommon-4b654a1221de4b3e77af2a079061505bbb899376.tar.bz2 libxkbcommon-4b654a1221de4b3e77af2a079061505bbb899376.zip | |
Remove unnecessary options
Change-Id: I605e843c10f982d20c64d8d6a1049b2c86526143
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | meson_options.txt | 6 | ||||
| -rw-r--r-- | packaging/libxkbcommon.spec | 2 | ||||
| -rw-r--r-- | xkbcommon-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | xkbcommon-x11-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | xkbcommon-x11.pc.in | 2 | ||||
| -rw-r--r-- | xkbcommon.pc.in | 2 |
7 files changed, 5 insertions, 17 deletions
diff --git a/meson.build b/meson.build index c9e7845..cd012b6 100644 --- a/meson.build +++ b/meson.build @@ -202,12 +202,6 @@ if have_version_script libxkbcommon_link_args += '-Wl,--version-script=' + join_paths(meson.source_root(), 'xkbcommon.map') 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', 'xkbcommon/xkbcommon.h', diff --git a/meson_options.txt b/meson_options.txt index 36e4b98..0e166b1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -56,9 +56,3 @@ option( value: true, description: 'Enable support for Wayland utility programs', ) -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 --- 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 --- 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 --- 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 --- 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 --- 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 |