diff options
author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-09-27 21:32:44 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-10-04 18:54:16 +0200 |
commit | aaffd209fae91a733fe0becb72268f87bf4ea369 (patch) | |
tree | 40569895ef8a09c605060e2164d86567a12f9889 /package/matchbox | |
parent | 1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff) |
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/matchbox')
8 files changed, 23 insertions, 23 deletions
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk index 730635fc7..74bbebba4 100644 --- a/package/matchbox/matchbox-common/matchbox-common.mk +++ b/package/matchbox/matchbox-common/matchbox-common.mk @@ -13,7 +13,7 @@ MATCHBOX_COMMON_LICENSE_FILES = COPYING MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y) - MATCHBOX_COMMON_CONF_OPT += --enable-pda-folders + MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders endif ################################################################################ diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk index 9989e148a..d0bac321e 100644 --- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk +++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk @@ -11,7 +11,7 @@ MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matc MATCHBOX_DESKTOP_LICENSE = GPLv2+ MATCHBOX_DESKTOP_LICENSE_FILES = COPYING MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib -MATCHBOX_DESKTOP_CONF_OPT = --enable-expat +MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat # The bundled configure script does not properly replace LIBADD_DL, so # we force an autoreconf even if we don't have any patches touching @@ -21,10 +21,10 @@ MATCHBOX_DESKTOP_AUTORECONF = YES ################################################################################ ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) - MATCHBOX_DESKTOP_CONF_OPT += --enable-startup-notification + MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification else - MATCHBOX_DESKTOP_CONF_OPT += --disable-startup-notification + MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification endif ################################################################################ diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk index 47de4a070..a7ad7907a 100644 --- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk +++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk @@ -11,7 +11,7 @@ MATCHBOX_FAKEKEY_LICENSE = GPLv2+ MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING MATCHBOX_FAKEKEY_INSTALL_STAGING = YES MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst -MATCHBOX_FAKEKEY_CONF_OPT = --enable-expat +MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk index f8bf19a64..87e49e3a8 100644 --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk @@ -23,7 +23,7 @@ MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FI ################################################################################ ifeq ($(BR2_PACKAGE_CAIRO),y) - MATCHBOX_KEYBOARD_CONF_OPT += --enable-cairo + MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo MATCHBOX_KEYBOARD_DEPENDENCIES += cairo else MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk index a04b97107..8b1eacd60 100644 --- a/package/matchbox/matchbox-lib/matchbox-lib.mk +++ b/package/matchbox/matchbox-lib/matchbox-lib.mk @@ -11,7 +11,7 @@ MATCHBOX_LIB_LICENSE = LGPLv2.1+ MATCHBOX_LIB_LICENSE_FILES = COPYING MATCHBOX_LIB_INSTALL_STAGING = YES MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext -MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs +MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs MATCHBOX_LIB_CONF_ENV = LIBS="-lX11" define MATCHBOX_LIB_POST_INSTALL_FIXES @@ -29,31 +29,31 @@ endif endif ifeq ($(BR2_PACKAGE_JPEG),y) - MATCHBOX_LIB_CONF_OPT += --enable-jpeg + MATCHBOX_LIB_CONF_OPTS += --enable-jpeg MATCHBOX_LIB_DEPENDENCIES += jpeg else - MATCHBOX_LIB_CONF_OPT += --disable-jpeg + MATCHBOX_LIB_CONF_OPTS += --disable-jpeg endif ifeq ($(BR2_PACKAGE_LIBPNG),y) - MATCHBOX_LIB_CONF_OPT += --enable-png + MATCHBOX_LIB_CONF_OPTS += --enable-png MATCHBOX_LIB_DEPENDENCIES += libpng else - MATCHBOX_LIB_CONF_OPT += --disable-png + MATCHBOX_LIB_CONF_OPTS += --disable-png endif ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy) - MATCHBOX_LIB_CONF_OPT += --enable-pango + MATCHBOX_LIB_CONF_OPTS += --enable-pango MATCHBOX_LIB_DEPENDENCIES += pango else - MATCHBOX_LIB_CONF_OPT += --disable-pango + MATCHBOX_LIB_CONF_OPTS += --disable-pango endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) - MATCHBOX_LIB_CONF_OPT += --enable-xft + MATCHBOX_LIB_CONF_OPTS += --enable-xft MATCHBOX_LIB_DEPENDENCIES += xlib_libXft else - MATCHBOX_LIB_CONF_OPT += --disable-xft + MATCHBOX_LIB_CONF_OPTS += --disable-xft endif ################################################################################ diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk index 7579d4915..b4b1778e6 100644 --- a/package/matchbox/matchbox-panel/matchbox-panel.mk +++ b/package/matchbox/matchbox-panel/matchbox-panel.mk @@ -11,15 +11,15 @@ MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchb MATCHBOX_PANEL_LICENSE = GPLv2+ MATCHBOX_PANEL_LICENSE_FILES = COPYING MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib -MATCHBOX_PANEL_CONF_OPT = --enable-expat +MATCHBOX_PANEL_CONF_OPTS = --enable-expat ################################################################################ ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) - MATCHBOX_PANEL_CONF_OPT += --enable-startup-notification + MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor else - MATCHBOX_PANEL_CONF_OPT += --disable-startup-notification + MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification endif ################################################################################ diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk index 316893e35..c6298d8ec 100644 --- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk +++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk @@ -10,7 +10,7 @@ MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/match MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2+ MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification -MATCHBOX_STARTUP_MONITOR_CONF_OPT = +MATCHBOX_STARTUP_MONITOR_CONF_OPTS = ################################################################################ diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk index 696e9ccea..a3a43261f 100644 --- a/package/matchbox/matchbox-wm/matchbox-wm.mk +++ b/package/matchbox/matchbox-wm/matchbox-wm.mk @@ -11,7 +11,7 @@ MATCHBOX_WM_LICENSE = GPLv2+ MATCHBOX_WM_LICENSE_FILES = COPYING MATCHBOX_WM_DEPENDENCIES = matchbox-lib -MATCHBOX_WM_CONF_OPT = --enable-expat +MATCHBOX_WM_CONF_OPTS = --enable-expat # Workaround bug in configure script MATCHBOX_WM_CONF_ENV = expat=yes @@ -20,7 +20,7 @@ MATCHBOX_WM_CONF_ENV = expat=yes ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) - MATCHBOX_WM_CONF_OPT += --enable-composite + MATCHBOX_WM_CONF_OPTS += --enable-composite MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite MATCHBOX_WM_DEPENDENCIES += xlib_libXpm endif @@ -34,10 +34,10 @@ else endif ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) - MATCHBOX_WM_CONF_OPT += --enable-startup-notification + MATCHBOX_WM_CONF_OPTS += --enable-startup-notification MATCHBOX_WM_DEPENDENCIES += startup-notification else - MATCHBOX_WM_CONF_OPT += --disable-startup-notification + MATCHBOX_WM_CONF_OPTS += --disable-startup-notification endif ################################################################################ |