tools: mkeficapsule: use pkg-config for each lib separat

Call pkg-config for each library individually.
This improves fallback handling.

Suggested-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Fixes: 31a7688cbe0e ("tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls")
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/tools/Makefile b/tools/Makefile
index 005e7362a31ab54a998ea91909a4bdaf6dbbdcb1..3626919633aac8e91eb0ec48cb5c4d04cfa575fc 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -245,9 +245,13 @@ hostprogs-$(CONFIG_ASN1_COMPILER)  += asn1_compiler
 HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
 
 HOSTCFLAGS_mkeficapsule.o += \
-       $(shell pkg-config --cflags gnutls uuid 2> /dev/null || echo "")
+       $(shell pkg-config --cflags gnutls 2> /dev/null || echo "")
+HOSTCFLAGS_mkeficapsule.o += \
+       $(shell pkg-config --cflags uuid 2> /dev/null || echo "")
+HOSTLDLIBS_mkeficapsule += \
+       $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls")
 HOSTLDLIBS_mkeficapsule += \
-       $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid")
+       $(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid")
 hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
 
 # We build some files with extra pedantic flags to try to minimize things