packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS

While the autotools infrastructure was using FOO_MAKE_OPT, generic packages
were typically using FOO_MAKE_OPTS. This inconsistency becomes a problem
when a new infrastructure is introduced that wants to make use of
FOO_MAKE_OPT(S), and can live alongside either generic-package or
autotools-package. The new infrastructure will have to choose between either
OPT or OPTS, and thus rule out transparent usage by respectively generic
packages or generic packages. An example of such an infrastructure is
kconfig-package, which provides kconfig-related make targets.

The OPTS variant is more logical, as there are typically multiple options.

This patch renames all occurrences of FOO_MAKE_OPT in FOO_MAKE_OPTS.
Sed command used:
    find * -type f | xargs sed -i 's#_MAKE_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>

diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk
index 07df75db32220a14684d51f6bade0b8af72f447c..91b668443c8935e443de05a1b12c93dbfea8a56f 100644 (file)
--- a/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/boot/at91bootstrap3/at91bootstrap3.mk
@@ -17,7 +17,7 @@ AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE = \
 AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \
        $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR))
 
-AT91BOOTSTRAP3_MAKE_OPT = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
+AT91BOOTSTRAP3_MAKE_OPTS = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
 
 ifneq ($(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR),)
 define AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES
@@ -41,7 +41,7 @@ define AT91BOOTSTRAP3_CONFIGURE_CMDS
 endef
 
 define AT91BOOTSTRAP3_BUILD_CMDS
-       $(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) boot
+       $(MAKE) $(AT91BOOTSTRAP3_MAKE_OPTS) -C $(@D) boot
 endef
 
 define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS

diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
index 4329ca7cea07df8ae7c53814a1cc992d0c22e69b..9fb765fe16016ee6d6b788e4b7bd9459ad45c956 100644 (file)
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -111,7 +111,7 @@ cases, typical packages will therefore only use a few of them.
   variables to pass to make in the build step. These are passed before
   the +make+ command. By default, empty.
 
-* +LIBFOO_MAKE_OPT+, to specify additional variables to
+* +LIBFOO_MAKE_OPTS+, to specify additional variables to
   pass to make in the build step. These are passed after the
   +make+ command. By default, empty.
 

diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
index d648fee3520ee3ad8da3a6d4b72bea7ef0fed06b..828fc345c724a834a510db229233db9d7156b58c 100644 (file)
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -108,7 +108,7 @@ typical packages will therefore only use a few of them.
   pass to make in the build step. These are passed before the +make+
   command. By default, empty.
 
-* +LIBFOO_MAKE_OPT+, to specify additional variables to pass to make
+* +LIBFOO_MAKE_OPTS+, to specify additional variables to pass to make
   in the build step. These are passed after the +make+ command. By
   default, empty.
 

diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
index f14b87b9dc2c3c275dc56b2f10880d99b5817ba6..979a2b5f5e1917afd9df4ed44a167f485bafd8cb 100644 (file)
--- a/docs/manual/adding-packages-kconfig.txt
+++ b/docs/manual/adding-packages-kconfig.txt
@@ -47,7 +47,7 @@ be set to suit the needs of the package under consideration:
   support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
 
 * +FOO_KCONFIG_OPT+: extra options to pass when calling the kconfig
-  ediftors. This may need to include '$(FOO_MAKE_OPT)', for example. By
+  editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
   default, empty.
 
 * +FOO_KCONFIG_FIXUP_CMDS+: a list of shell commands needed to fixup the

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 55527dcde7e7f46d99fea140f5951a305c5157cc..f862fcb951d404d9a7aaedb3c1d4ac0d65593ad6 100644 (file)
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -138,7 +138,7 @@ else
 AVAHI_CONF_OPT += --disable-python
 endif
 
-AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
+AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
 
 define AVAHI_USERS
        avahi -1 avahi -1 * - - -

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index e7f5776dc05bff2847dd0900aacd929ff7b1c7aa..e7123f8fde4d04802536116c0a0085ea4ef44450 100644 (file)
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -8,8 +8,8 @@ DNSMASQ_VERSION = 2.72
 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
-DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
-DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
+DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
+DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_DEPENDENCIES = host-pkgconf
 DNSMASQ_LICENSE = Dual GPLv2/GPLv3
 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
@@ -37,7 +37,7 @@ endif
 # NLS requires IDN so only enable it (i18n) when IDN is true
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
        DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext
-       DNSMASQ_MAKE_OPT += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
+       DNSMASQ_MAKE_OPTS += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
        DNSMASQ_COPTS += -DHAVE_IDN
        DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)
 endif
@@ -58,7 +58,7 @@ ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
 
 # liblua uses dlopen when dynamically linked
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
-       DNSMASQ_MAKE_OPT += LIBS+="-ldl"
+       DNSMASQ_MAKE_OPTS += LIBS+="-ldl"
 endif
 
 define DNSMASQ_ENABLE_LUA
@@ -98,11 +98,11 @@ define DNSMASQ_BUILD_CMDS
        $(DNSMASQ_ENABLE_DBUS)
        $(DNSMASQ_ENABLE_LUA)
        $(DNSMASQ_ENABLE_CONNTRACK)
-       $(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPT) all$(DNSMASQ_I18N)
+       $(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N)
 endef
 
 define DNSMASQ_INSTALL_TARGET_CMDS
-       $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install$(DNSMASQ_I18N)
+       $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) install$(DNSMASQ_I18N)
        mkdir -p $(TARGET_DIR)/var/lib/misc/
 endef
 

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index b115582298d88a7f0356217c98b023487dde0774..468767f8797cb7208139a099ad4d3ea29e3f59ee 100644 (file)
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -31,7 +31,7 @@ endif
 
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
 
-E2FSPROGS_MAKE_OPT = \
+E2FSPROGS_MAKE_OPTS = \
        LDCONFIG=true
 
 define HOST_E2FSPROGS_INSTALL_CMDS

diff --git a/package/faifa/faifa.mk b/package/faifa/faifa.mk
index a2a2a56160ed9b3a7f9e28e9f5603640f27e237f..a56a8c03325a595f944b99cd24a5301c41e9e68a 100644 (file)
--- a/package/faifa/faifa.mk
+++ b/package/faifa/faifa.mk
@@ -11,7 +11,7 @@ FAIFA_DEPENDENCIES = libpcap host-autoconf
 FAIFA_LICENSE = BSD-3c
 FAIFA_LICENSE_FILES = COPYING
 
-FAIFA_MAKE_OPT += GIT_REV=$(FAIFA_VERSION)
+FAIFA_MAKE_OPTS += GIT_REV=$(FAIFA_VERSION)
 
 # This package uses autoconf, but not automake, so we need to call
 # their special autogen.sh script, and have custom target and staging

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 52a8fb48b1e0f10facb8bae89b7e95fad8ffd734..8643a8f2233a50260e1c1a3747f0ddd995d4a6a1 100644 (file)
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -8,7 +8,7 @@ FREETYPE_VERSION = 2.5.3
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_INSTALL_STAGING = YES
-FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
+FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
 FREETYPE_LICENSE = Dual FTL/GPLv2+
 FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
 FREETYPE_DEPENDENCIES = host-pkgconf

diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index 4470477a142b6bbf7d1b46f4790238893e8d4fca..45a0f4f882ccd06c64b88f19be988990a916634c 100644 (file)
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -53,7 +53,7 @@ HOST_GCC_INITIAL_CONF_ENV = \
 # We need to tell gcc that the C library will be providing the ssp
 # support, as it can't guess it since the C library hasn't been built
 # yet (we're gcc-initial).
-HOST_GCC_INITIAL_MAKE_OPT = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
+HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
 HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
 
 $(eval $(host-autotools-package))

diff --git a/package/httping/httping.mk b/package/httping/httping.mk
index 719b0db25e2118d692ce51c4d49c08eb6e441b41..e868463a8eaf59d267e92975add3a22dfb99a9b2 100644 (file)
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -18,19 +18,19 @@ HTTPING_DEPENDENCIES = host-gettext \
        $(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \
        $(if $(BR2_PACKAGE_OPENSSL),openssl) \
        $(if $(BR2_PACKAGE_FFTW),fftw)
-HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
+HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
        FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \
        NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \
        SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
        TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no)
 
 define HTTPING_BUILD_CMDS
-       $(HTTPING_MAKE_OPT) LDFLAGS="$(HTTPING_LDFLAGS)" \
+       $(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \
                $(MAKE) DEBUG=no -C $(@D)
 endef
 
 define HTTPING_INSTALL_TARGET_CMDS
-       $(HTTPING_MAKE_OPT) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+       $(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
 endef
 
 $(eval $(generic-package))

diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 2be32be00fbf4e0ab8e00179d871223b5e7a970b..9bfeaf58de54772bbd3bf4248df646b06ee07261 100644 (file)
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -13,7 +13,7 @@ IPSEC_TOOLS_MAKE = $(MAKE1)
 IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
 
 # configure hardcodes -Werror, so override CFLAGS on make invocation
-IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
+IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)'
 
 # openssl uses zlib, so we need to explicitly link with it when static
 ifeq ($(BR2_PREFER_STATIC_LIB),y)

diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 71300a57b7fade242a4b137cfbb1855193b0ef60..735ed65e7cce951378f29c84f1bbcec55fd16452 100644 (file)
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -18,7 +18,7 @@ IPUTILS_DEPENDENCIES += busybox
 endif
 
 # Disabling CAP_SETPCAP (file capabilities)
-IPUTILS_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
+IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
        CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
        arping clockdiff ping rarpd rdisc tftpd tracepath
 
@@ -26,7 +26,7 @@ ifeq ($(BR2_INET_IPV6),y)
 # To support md5 for ping6
 IPUTILS_DEPENDENCIES += openssl
 
-IPUTILS_MAKE_OPT += ping6 tracepath6 traceroute6
+IPUTILS_MAKE_OPTS += ping6 tracepath6 traceroute6
 
 define IPUTILS_IPV6_INSTALL_TARGET_CMDS
        $(INSTALL) -D -m 755 $(@D)/ping6       $(TARGET_DIR)/bin/ping6
@@ -36,7 +36,7 @@ endef
 endif
 
 define IPUTILS_BUILD_CMDS
-       $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPT)
+       $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
 endef
 
 define IPUTILS_INSTALL_TARGET_CMDS

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 4eb0b07b67877d21ff346fb26c7adc0802bcbb20..f533a45a04a28b8ecd03962e742e79be981658c3 100644 (file)
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -10,18 +10,18 @@ IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw
 IW_LICENSE = iw license
 IW_LICENSE_FILES = COPYING
 IW_DEPENDENCIES = host-pkgconf libnl
-IW_MAKE_OPT = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
+IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
 IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
        GIT_DIR=$(IW_DIR)
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 # libnl needs pthread/m, so we need to explicitly with them when static
 # these need to added AFTER libnl, so we have to override LIBS completely
-IW_MAKE_OPT += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
+IW_MAKE_OPTS += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
 endif
 
 define IW_BUILD_CMDS
-       $(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPT) -C $(@D)
+       $(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPTS) -C $(@D)
 endef
 
 define IW_INSTALL_TARGET_CMDS

diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index 177ef78d5405ab9bcf49232f876955bcb06e6987..520c409e86085dc5f4ff4bee1e06872eb6914357 100644 (file)
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -17,9 +17,9 @@ LIBDNET_CONF_OPT = \
 ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
 LIBDNET_DEPENDENCIES = python
 LIBDNET_CONF_OPT += --with-python
-LIBDNET_MAKE_OPT = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
-LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
-LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
+LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
+LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
+LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
 endif
 
 # Needed for autoreconf to work properly

diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk
index dc30b50244c0058c53724a4e50b2fdd4e0377c6e..cfb839d1f73198049979f9f9536983064ea052ee 100644 (file)
--- a/package/libjson/libjson.mk
+++ b/package/libjson/libjson.mk
@@ -14,13 +14,13 @@ LIBJSON_LICENSE_FILES = License.txt
 LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LIBJSON_MAKE_OPT += SHARED=0
+LIBJSON_MAKE_OPTS += SHARED=0
 else
-LIBJSON_MAKE_OPT += SHARED=1
+LIBJSON_MAKE_OPTS += SHARED=1
 LIBJSON_CXXFLAGS += -fPIC
 endif
 
-LIBJSON_MAKE_OPT += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
+LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
 
 define LIBJSON_EXTRACT_CMDS
        unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)
@@ -33,17 +33,17 @@ define LIBJSON_BUILD_CMDS
        mkdir -p $(@D)/Objects_$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
                $(@D)/_internal/Source/Dependencies
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-               $(LIBJSON_MAKE_OPT) -C $(@D)
+               $(LIBJSON_MAKE_OPTS) -C $(@D)
 endef
 
 define LIBJSON_INSTALL_TARGET_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-               $(LIBJSON_MAKE_OPT) prefix=$(TARGET_DIR)/usr install -C $(@D)
+               $(LIBJSON_MAKE_OPTS) prefix=$(TARGET_DIR)/usr install -C $(@D)
 endef
 
 define LIBJSON_INSTALL_STAGING_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-               $(LIBJSON_MAKE_OPT) prefix=$(STAGING_DIR)/usr install -C $(@D)
+               $(LIBJSON_MAKE_OPTS) prefix=$(STAGING_DIR)/usr install -C $(@D)
 endef
 
 $(eval $(generic-package))

diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
index 3002388173a8656c7b0623feae28e62b82615e6c..5340b066fdd406709364f4deadf1c9ed946b3241 100644 (file)
--- a/package/libseccomp/libseccomp.mk
+++ b/package/libseccomp/libseccomp.mk
@@ -13,7 +13,7 @@ LIBSECCOMP_INSTALL_STAGING = YES
 # Needed for configure to find our system headers:
 LIBSECCOMP_CONF_ENV            = SYSROOT=$(STAGING_DIR)
 LIBSECCOMP_MAKE_ENV            = $(TARGET_CONFIGURE_OPTS)
-LIBSECCOMP_MAKE_OPT            = SUBDIRS_BUILD=src
+LIBSECCOMP_MAKE_OPTS            = SUBDIRS_BUILD=src
 LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
 LIBSECCOMP_INSTALL_TARGET_OPT  = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
 

diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index 2eae3bb2842762ecbb84117cf6e4102e4a531774..f9dd757bdfa865f83b4976404ff151dedb4bbd69 100644 (file)
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -23,7 +23,7 @@ LINUX_PAM_LICENSE_FILES = Copyright
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
        LINUX_PAM_DEPENDENCIES += gettext
-       LINUX_PAM_MAKE_OPT += LIBS=-lintl
+       LINUX_PAM_MAKE_OPTS += LIBS=-lintl
 endif
 
 # Install default pam config (deny everything)

diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index 61e1c734ef383741a9c2443265a8aa856db21f9a..3bd111eaa67dd68eef3bc76a826dd430866bd0de 100644 (file)
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -20,28 +20,28 @@ LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISASET) += sbin/isaset
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
-LM_SENSORS_MAKE_OPT = \
+LM_SENSORS_MAKE_OPTS = \
        BUILD_STATIC_LIB=1 \
        MACHINE=$(KERNEL_ARCH) \
        PREFIX=/usr
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LM_SENSORS_MAKE_OPT += BUILD_SHARED_LIB=0
+LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0
 else
-LM_SENSORS_MAKE_OPT += BUILD_SHARED_LIB=1
+LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=1
 endif
 
 define LM_SENSORS_BUILD_CMDS
-       $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPT) -C $(@D)
+       $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D)
 endef
 
 define LM_SENSORS_INSTALL_STAGING_CMDS
-       $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
+       $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
        rm -f $(addprefix $(STAGING_DIR)/usr/,$(LM_SENSORS_BINS_) $(LM_SENSORS_BINS_y))
 endef
 
 define LM_SENSORS_INSTALL_TARGET_CMDS
-       $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+       $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
        rm -f $(addprefix $(TARGET_DIR)/usr/,$(LM_SENSORS_BINS_))
 endef
 

diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index ee153505e9a9312548813ff7b857c309e769df7d..e0c81d4abb65b2aa76befb1c66b04ef795483976 100644 (file)
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -14,18 +14,18 @@ ifeq ($(BR2_ENABLE_LOCALE),)
 LSHW_CFLAGS += -DNONLS
 endif
 
-LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
+LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
        RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
 LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
 LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 define LSHW_BUILD_CMDS
-       $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)
+       $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS)
 endef
 
 define LSHW_INSTALL_TARGET_CMDS
        $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \
-               $(LSHW_MAKE_OPT) install
+               $(LSHW_MAKE_OPTS) install
 endef
 
 $(eval $(generic-package))

diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 612f92f5d98d86433cafc1eed45692a6fcfb349a..a7ef5149b5623445cbca0791816ce900226715b8 100644 (file)
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -32,7 +32,7 @@ LVM2_CONF_OPT += --disable-readline
 endif
 
 ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
-LVM2_MAKE_OPT = device-mapper
+LVM2_MAKE_OPTS = device-mapper
 LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
 LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
 endif

diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 01fc77a666eb9e6c88a75f13a2f75b405dea7cf0..6c579762d1999f29aac3e898cc5adad64d00b7aa 100644 (file)
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -10,7 +10,7 @@ MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
 MDADM_LICENSE = GPLv2+
 MDADM_LICENSE_FILES = COPYING
 
-MDADM_MAKE_OPT = \
+MDADM_MAKE_OPTS = \
        CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
 
 MDADM_INSTALL_TARGET_OPT = \

diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
index 7a7bc7f343babbbdb29a0ab723f8eb882d3cbc2b..a0e4dcf7bee9f2d69c927662cbb5f794abef90ab 100644 (file)
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -11,7 +11,7 @@ MII_DIAG_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
 MII_DIAG_LICENSE = GPL # No version specified
 MII_DIAG_LICENSE_FILES = mii-diag.c
 
-MII_DIAG_MAKE_OPT = $(TARGET_CONFIGURE_OPTS)
+MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
 
 define MII_DIAG_DEBIAN_PATCHES
        if [ -d $(@D)/debian/patches ]; then \
@@ -22,7 +22,7 @@ endef
 MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES
 
 define MII_DIAG_BUILD_CMDS
-       $(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D) mii-diag
+       $(MAKE) $(MII_DIAG_MAKE_OPTS) -C $(@D) mii-diag
 endef
 
 define MII_DIAG_INSTALL_TARGET_CMDS

diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index 52d88fecb55b0e5dc7223be11b3746cdeaaf8666..3d232474d395711d3e43e329e7c74898d5381157 100644 (file)
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -11,7 +11,7 @@ MPFR_LICENSE = LGPLv3+
 MPFR_LICENSE_FILES = COPYING.LESSER
 MPFR_INSTALL_STAGING = YES
 MPFR_DEPENDENCIES = gmp
-MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)
+MPFR_MAKE_OPTS = RANLIB=$(TARGET_RANLIB)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index ce5bdfbbecc5e45fdaa981a23b2ce9ca93532611..ca29daa66ab5b171bf2915bf806eec68779843bf 100644 (file)
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -10,31 +10,31 @@ OPENSWAN_LICENSE = GPLv2+, BSD-3c
 OPENSWAN_LICENSE_FILES = COPYING LICENSE
 
 OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
-OPENSWAN_MAKE_OPT = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
+OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
        USERCOMPILE="$(TARGET_CFLAGS) -fPIE" INC_USRLOCAL=/usr \
        USE_KLIPS=false USE_MAST=false USE_NM=false
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
        OPENSWAN_DEPENDENCIES += libcurl
-       OPENSWAN_MAKE_OPT += USE_LIBCURL=true
+       OPENSWAN_MAKE_OPTS += USE_LIBCURL=true
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
        OPENSWAN_DEPENDENCIES += openssl
-       OPENSWAN_MAKE_OPT += HAVE_OPENSSL=true
+       OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true
 ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
-       OPENSWAN_MAKE_OPT += HAVE_OCF=true
+       OPENSWAN_MAKE_OPTS += HAVE_OCF=true
 endif
 endif
 
 define OPENSWAN_BUILD_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-               $(OPENSWAN_MAKE_OPT) programs
+               $(OPENSWAN_MAKE_OPTS) programs
 endef
 
 define OPENSWAN_INSTALL_TARGET_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-               $(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+               $(OPENSWAN_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
 endef
 
 $(eval $(generic-package))

diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk
index 919164387adda9c81286a771671a69ef8ec5d5bc..b626ad1151756148610909c3ffcb744418fc03c2 100644 (file)
--- a/package/openvmtools/openvmtools.mk
+++ b/package/openvmtools/openvmtools.mk
@@ -41,7 +41,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PAM),y)
 OPENVMTOOLS_CONF_OPT += --with-pam
-OPENVMTOOLS_MAKE_OPT += CFLAGS+="-Wno-unused-local-typedefs"
+OPENVMTOOLS_MAKE_OPTS += CFLAGS+="-Wno-unused-local-typedefs"
 OPENVMTOOLS_DEPENDENCIES += linux-pam
 else
 OPENVMTOOLS_CONF_OPT += --without-pam

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 4404f15cf10cd45c7926f6546ddc1371e3ba8014..1884d4de4ae08b6c67521dbc3fe6e8bf017b6b3b 100644 (file)
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -106,7 +106,7 @@ endif
 $(2)_CONF_ENV                  ?=
 $(2)_CONF_OPT                  ?=
 $(2)_MAKE_ENV                  ?=
-$(2)_MAKE_OPT                  ?=
+$(2)_MAKE_OPTS                 ?=
 $(2)_INSTALL_OPT                ?= install
 $(2)_INSTALL_STAGING_OPT       ?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT                ?= DESTDIR=$$(TARGET_DIR)  install
@@ -270,11 +270,11 @@ endif
 ifndef $(2)_BUILD_CMDS
 ifeq ($(4),target)
 define $(2)_BUILD_CMDS
-       $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+       $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR)
 endef
 else
 define $(2)_BUILD_CMDS
-       $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+       $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 endif

diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index 2006b76bc8ced5e6a82c0bc952c104890f2d65db..f146d51b75fac852a5b6544bc7d3bea4ed31c98b 100644 (file)
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -40,7 +40,7 @@ $(2)_CONF_ENV                 ?=
 $(2)_CONF_OPT                  ?=
 $(2)_MAKE                      ?= $$(MAKE)
 $(2)_MAKE_ENV                  ?=
-$(2)_MAKE_OPT                  ?=
+$(2)_MAKE_OPTS                 ?=
 $(2)_INSTALL_HOST_OPT          ?= install
 $(2)_INSTALL_STAGING_OPT       ?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT                ?= DESTDIR=$$(TARGET_DIR) install
@@ -111,11 +111,11 @@ $(2)_DEPENDENCIES += host-cmake
 ifndef $(2)_BUILD_CMDS
 ifeq ($(4),target)
 define $(2)_BUILD_CMDS
-       $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR)
+       $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
 endef
 else
 define $(2)_BUILD_CMDS
-       $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR)
+       $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 endif
@@ -126,7 +126,7 @@ endif
 #
 ifndef $(2)_INSTALL_CMDS
 define $(2)_INSTALL_CMDS
-       $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
+       $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 
@@ -136,7 +136,7 @@ endif
 #
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
-       $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
+       $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 
@@ -146,7 +146,7 @@ endif
 #
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
-       $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
+       $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 

diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 46caa36b5f9974b9d949d203bac701734d13c096..eb06eec40175c6c5d1945753cb4a40b28967063a 100644 (file)
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -19,11 +19,11 @@ PPPD_RADIUS_CONF = dictionary dictionary.ascend dictionary.compat \
 
 ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
        PPPD_DEPENDENCIES += libpcap
-       PPPD_MAKE_OPT += FILTER=y
+       PPPD_MAKE_OPTS += FILTER=y
 endif
 
 ifeq ($(BR2_INET_IPV6),y)
-       PPPD_MAKE_OPT += HAVE_INET6=y
+       PPPD_MAKE_OPTS += HAVE_INET6=y
 endif
 
 # pppd bundles some but not all of the needed kernel headers. The embedded
@@ -43,7 +43,7 @@ endef
 
 define PPPD_BUILD_CMDS
        $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
-               -C $(@D) $(PPPD_MAKE_OPT)
+               -C $(@D) $(PPPD_MAKE_OPTS)
 endef
 
 ifeq ($(BR2_PACKAGE_PPPD_RADIUS),y)
@@ -94,7 +94,7 @@ define PPPD_INSTALL_TARGET_CMDS
 endef
 
 define PPPD_INSTALL_STAGING_CMDS
-       $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPT) install-devel
+       $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel
 endef
 
 $(eval $(generic-package))

diff --git a/package/pv/pv.mk b/package/pv/pv.mk
index 0ba8f5f7b20492368f75e8a330223b2828881106..095b0d6b195e98eb0f15c495db76a8787ce8eb6a 100644 (file)
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -23,7 +23,7 @@ PV_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext host-gettext)
 # configuration, as the ld default emulation may not necessarily be
 # the correct one. By passing the below values for LD and LDFLAGS, we
 # ensure that 'gcc' is used to do these partial linking steps.
-PV_MAKE_OPT = \
+PV_MAKE_OPTS = \
        LD="$(TARGET_CC)" \
        LDFLAGS="-Wl,-r -nostdlib"
 

diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 1cc96d73025d37905ae08a9366e13617e2b89c75..df049af24abf4cdcf29240976851a7902a672973 100644 (file)
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -24,7 +24,7 @@ QUOTA_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
 QUOTA_LDFLAGS += -ltirpc
 endif
 
-QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
+QUOTA_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
 QUOTA_CONF_ENV = \
        CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
 

diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index fde1e61298a88340f6442cd994ce0923ed02d873..24974469f784eb34e48dffdbe2dba462472210be 100644 (file)
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -11,7 +11,7 @@ RP_PPPOE_LICENSE_FILES = doc/LICENSE
 RP_PPPOE_DEPENDENCIES = pppd
 RP_PPPOE_SUBDIR = src
 RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
-RP_PPPOE_MAKE_OPT = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
+RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
 RP_PPPOE_CONF_OPT = --disable-debugging
 RP_PPPOE_CONF_ENV = \
        rpppoe_cv_pack_bitfields=normal \

diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
index 5427830d11b93b38383fd40093e4c91dc9cf0b49..675a4d0c7d19a139f9b857a8549d6fdd5319e57d 100644 (file)
--- a/package/rubix/rubix.mk
+++ b/package/rubix/rubix.mk
@@ -11,7 +11,7 @@ RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
 RUBIX_LICENSE = Public Domain
 RUBIX_LICENSE_FILES = LICENCE
 
-RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
+RUBIX_MAKE_OPTS = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
 
 RUBIX_DEPENDENCIES = xlib_libX11
 

diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
index 75dc588097744017cad80d44c1361879855c5bb3..96387d37fc5eacb8dfcd2441268df0fe793e1897 100644 (file)
--- a/package/schifra/schifra.mk
+++ b/package/schifra/schifra.mk
@@ -11,13 +11,13 @@ SCHIFRA_INSTALL_STAGING = YES
 SCHIFRA_LICENSE = schifra license
 SCHIFRA_LICENSE_FILES = schifra_license.txt
 
-SCHIFRA_MAKE_OPT = COMPILER="$(TARGET_CXX)" \
+SCHIFRA_MAKE_OPTS = COMPILER="$(TARGET_CXX)" \
                   OPTIONS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o"
 
 # The examples are the only buildable artefacts.
 ifeq ($(BR2_PACKAGE_SCHIFRA_EXAMPLES),y)
 define SCHIFRA_BUILD_CMDS
-       $(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPT) all
+       $(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPTS) all
 endef
 
 define SCHIFRA_INSTALL_EXAMPLES

diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index c3e8d2957a31dc60a426fa8f990e9f397f075a56..47b55f80e2793914248c0bc60f7f6a9177719676 100644 (file)
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -16,5 +16,5 @@ SDL_TTF_CONF_OPT = --without-x \
                --with-freetype-prefix=$(STAGING_DIR)/usr \
                --with-sdl-prefix=$(STAGING_DIR)/usr
 
-SDL_TTF_MAKE_OPT = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL"  LDFLAGS="-L$(STAGING_DIR)/usr/lib"
+SDL_TTF_MAKE_OPTS = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL"  LDFLAGS="-L$(STAGING_DIR)/usr/lib"
 $(eval $(autotools-package))

diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index 13174be6fc02e1ff89a81aca6f94de3fe6dff407..55be4c1a0b79b46588b5f4841da92bad47ff9a59 100644 (file)
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -11,7 +11,7 @@ SETSERIAL_SITE = http://snapshot.debian.org/archive/debian/20131001T214925Z/pool
 SETSERIAL_LICENSE = GPLv2
 SETSERIAL_LICENSE_FILES = debian/copyright
 # make all also builds setserial.cat which needs nroff
-SETSERIAL_MAKE_OPT = setserial
+SETSERIAL_MAKE_OPTS = setserial
 
 define SETSERIAL_APPLY_DEBIAN_PATCHES
        # Touching gorhack.h is needed for the Debian patch 18 to work

diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index 6eb7e90dbb84e8819c9cc11299840f75c010efa1..92aeb51b8c3f55cc1894aaba3dd7373a64decb23 100644 (file)
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -31,7 +31,7 @@ endef
 SPEEX_POST_CONFIGURE_HOOKS += SPEEX_LIBTOOL_FIXUP
 
 define SPEEX_BUILD_CMDS
-       $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+       $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) -C $(@D)/$($(PKG)_SUBDIR)
 endef
 
 $(eval $(autotools-package))

diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 9d413fe0f38bf7d6a39982087c5afc8ba010280c..56a6da208a5984d4312ea23d6b0479e7908a0b76 100644 (file)
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -14,7 +14,7 @@ SYSSTAT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 SYSSTAT_DEPENDENCIES += gettext
-SYSSTAT_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -lintl"
+SYSSTAT_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -lintl"
 endif
 
 # The isag tool is a post processing script that depends on tcl/tk

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index c7cff0de697b2430a76da0c01f400df6df30e206..ea6baaa9d43a9f3203898a91483f4a2dead5d727 100644 (file)
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -138,8 +138,8 @@ SYSTEMD_CONF_OPT += --disable-smack
 endif
 
 # mq_getattr needs -lrt
-SYSTEMD_MAKE_OPT += LIBS=-lrt
-SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl
+SYSTEMD_MAKE_OPTS += LIBS=-lrt
+SYSTEMD_MAKE_OPTS += LDFLAGS+=-ldl
 
 define SYSTEMD_INSTALL_INIT_HOOK
        ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init

diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index 33f7c0c765fa5c4458f2649650efe4d005739404..0ec358b2cf01bdf26c0d1c2ef25baec40cc04643 100644 (file)
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -6,7 +6,7 @@
 
 TN5250_VERSION = 0.17.4
 TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
-TN5250_MAKE_OPT = CPPFLAGS=""
+TN5250_MAKE_OPTS = CPPFLAGS=""
 TN5250_DEPENDENCIES = ncurses
 TN5250_LICENSE = LGPLv2.1+
 TN5250_LICENSE_FILES = COPYING

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 86770be0bee8972c97fbfc4f9d6f858ebe85b6e5..6202739bd2a5751e9106f82df506383c9cb9fcbd 100644 (file)
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -44,7 +44,7 @@ endif
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 UTIL_LINUX_DEPENDENCIES += gettext
-UTIL_LINUX_MAKE_OPT += LIBS=-lintl
+UTIL_LINUX_MAKE_OPTS += LIBS=-lintl
 endif
 
 ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)

diff --git a/package/whois/whois.mk b/package/whois/whois.mk
index 4c40481c2cd8d304f0a9770ba9349d398553b72d..3dbf338977a47638ce1ea8e61db7ed1d3a4e955e 100644 (file)
--- a/package/whois/whois.mk
+++ b/package/whois/whois.mk
@@ -10,7 +10,7 @@ WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
 # take precedence over busybox implementation
 WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
-WHOIS_MAKE_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
        LIBS="$(WHOIS_EXTRA_LIBS)"
 WHOIS_LICENSE = GPLv2+
 WHOIS_LICENSE_FILES = COPYING
@@ -32,11 +32,11 @@ WHOIS_MAKE_ENV += HAVE_LIBIDN=1
 endif
 
 define WHOIS_BUILD_CMDS
-       $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPT) -C $(@D)
+       $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) -C $(@D)
 endef
 
 define WHOIS_INSTALL_TARGET_CMDS
-       $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPT) \
+       $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \
                BASEDIR="$(TARGET_DIR)" install -C $(@D)
 endef
 

diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
index 34a449f907e3d0922d065f2314fb2f2c150c7e9d..a269878ef8a3b7d4e994683234ed236bbde15e1b 100644 (file)
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -28,6 +28,6 @@ XINETD_CONF_ENV += \
        CFLAGS="$(XINETD_CFLAGS)" \
        LIBS="$(XINETD_LIBS)"
 
-XINETD_MAKE_OPT = AR="$(TARGET_AR)"
+XINETD_MAKE_OPTS = AR="$(TARGET_AR)"
 
 $(eval $(autotools-package))

diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk
index c73a856750ceb146c7caf126ba890489d501571c..fbb0260b15a447c17aca767dc8b518c57d5b1159 100644 (file)
--- a/package/zmqpp/zmqpp.mk
+++ b/package/zmqpp/zmqpp.mk
@@ -11,7 +11,7 @@ ZMQPP_DEPENDENCIES = zeromq
 ZMQPP_LICENSE = LGPLv3+ with exceptions
 ZMQPP_LICENSE_FILES = COPYING COPYING.LESSER
 
-ZMQPP_MAKE_OPT = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
+ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
 ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread
 
 ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y)
@@ -21,19 +21,19 @@ endif
 define ZMQPP_BUILD_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
                LDFLAGS="$(ZMQPP_LDFLAGS)" \
-               $(ZMQPP_MAKE_OPT) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
+               $(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
 endef
 
 define ZMQPP_INSTALL_TARGET_CMDS
        $(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/include/zmqpp
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-               $(ZMQPP_MAKE_OPT) DESTDIR=$(TARGET_DIR) install -C $(@D)
+               $(ZMQPP_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -C $(@D)
 endef
 
 define ZMQPP_INSTALL_STAGING_CMDS
        $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/zmqpp
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-               $(ZMQPP_MAKE_OPT) DESTDIR=$(STAGING_DIR) install -C $(@D)
+               $(ZMQPP_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -C $(@D)
 endef
 
 $(eval $(generic-package))

diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
index 5942167fde8165889803ad84654f86e063029a0d..7d30cc3a1f3e5a0f540e13db78083fa789084f84 100644 (file)
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -17,7 +17,7 @@ ZXING_DEPENDENCIES += libiconv
 else
 # There is no locale support in the toolchain and libiconv
 # is not available so disable iconv support in zxing
-ZING_MAKE_OPT=CXXFLAGS+="-DNO_ICONV"
+ZING_MAKE_OPTS=CXXFLAGS+="-DNO_ICONV"
 endif
 endif
 
@@ -26,7 +26,7 @@ define ZXING_EXTRACT_CMDS
 endef
 
 define ZXING_BUILD_CMDS
-       $(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPT)
+       $(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPTS)
 endef
 
 define ZXING_INSTALL_STAGING_CMDS