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/libgtk2 | |
| 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/libgtk2')
| -rw-r--r-- | package/libgtk2/libgtk2.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 2ba94693c..9e79e605f 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -69,14 +69,14 @@ LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_cv_prog_F77=no \ ac_cv_path_CUPS_CONFIG=no -LIBGTK2_CONF_OPT = --disable-glibtest \ +LIBGTK2_CONF_OPTS = --disable-glibtest \ --enable-explicit-deps=no \ --disable-debug LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf # Xorg dependencies -LIBGTK2_CONF_OPT += \ +LIBGTK2_CONF_OPTS += \ --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib \ @@ -85,17 +85,17 @@ LIBGTK2_DEPENDENCIES += xlib_libXcomposite fontconfig xlib_libX11 \ xlib_libXext xlib_libXrender ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) - LIBGTK2_CONF_OPT += --enable-xinerama + LIBGTK2_CONF_OPTS += --enable-xinerama LIBGTK2_DEPENDENCIES += xlib_libXinerama else - LIBGTK2_CONF_OPT += --disable-xinerama + LIBGTK2_CONF_OPTS += --disable-xinerama endif ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) - LIBGTK2_CONF_OPT += --with-xinput=yes + LIBGTK2_CONF_OPTS += --with-xinput=yes LIBGTK2_DEPENDENCIES += xlib_libXi else - LIBGTK2_CONF_OPT += --with-xinput=no + LIBGTK2_CONF_OPTS += --with-xinput=no endif ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) @@ -121,25 +121,25 @@ endif ifeq ($(BR2_PACKAGE_LIBPNG),y) LIBGTK2_DEPENDENCIES += libpng else -LIBGTK2_CONF_OPT += --without-libpng +LIBGTK2_CONF_OPTS += --without-libpng endif ifeq ($(BR2_PACKAGE_JPEG),y) LIBGTK2_DEPENDENCIES += jpeg else -LIBGTK2_CONF_OPT += --without-libjpeg +LIBGTK2_CONF_OPTS += --without-libjpeg endif ifeq ($(BR2_PACKAGE_TIFF),y) LIBGTK2_DEPENDENCIES += tiff else -LIBGTK2_CONF_OPT += --without-libtiff +LIBGTK2_CONF_OPTS += --without-libtiff endif ifeq ($(BR2_PACKAGE_CUPS),y) LIBGTK2_DEPENDENCIES += cups else -LIBGTK2_CONF_OPT += --disable-cups +LIBGTK2_CONF_OPTS += --disable-cups endif ifeq ($(BR2_PACKAGE_LIBGTK2_DEMO),) @@ -158,7 +158,7 @@ endif # for the target. HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng host-gdk-pixbuf -HOST_LIBGTK2_CONF_OPT = \ +HOST_LIBGTK2_CONF_OPTS = \ --disable-static \ --disable-glibtest \ --without-libtiff \ |