Browse Source

libqrencode: select libpng only when tools are selected

As stated on the libqrencode web site, PNG (or SDL) is only
needed for the test and utility programs; the library itself
has no dependencies.

While we are here, remove spaces in the ifeq clause, to match
the examples in the buildroot manual.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Danomi Manchego 11 years ago
parent
commit
69635dbe2f
2 changed files with 4 additions and 4 deletions
  1. 1 1
      package/libqrencode/Config.in
  2. 3 3
      package/libqrencode/libqrencode.mk

+ 1 - 1
package/libqrencode/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBQRENCODE
 	bool "libqrencode"
-	select BR2_PACKAGE_LIBPNG
 	help
 	  libqrencode is a C library for encoding data in a QR Code
 	  symbol, a kind of 2D symbology that can be scanned by handy
@@ -14,6 +13,7 @@ if BR2_PACKAGE_LIBQRENCODE
 
 config BR2_PACKAGE_LIBQRENCODE_TOOLS
 	bool "libqrencode tools"
+	select BR2_PACKAGE_LIBPNG
 	help
 	  Build command-line tools
 

+ 3 - 3
package/libqrencode/libqrencode.mk

@@ -7,15 +7,15 @@
 LIBQRENCODE_VERSION = 3.4.2
 LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz
 LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode
-LIBQRENCODE_DEPENDENCIES = libpng
 LIBQRENCODE_INSTALL_STAGING = YES
 LIBQRENCODE_LICENSE = LGPLv2.1+
 LIBQRENCODE_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBQRENCODE_TOOLS),y)
-        LIBQRENCODE_CONF_OPT += --with-tools=yes
+LIBQRENCODE_CONF_OPT += --with-tools=yes
+LIBQRENCODE_DEPENDENCIES += libpng
 else
-        LIBQRENCODE_CONF_OPT += --with-tools=no
+LIBQRENCODE_CONF_OPT += --with-tools=no
 endif
 
 $(eval $(autotools-package))