]> git.ipfire.org Git - thirdparty/gnutls.git/commitdiff
build: do not generate mech-list.h if p11-kit is not available
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Sat, 2 Feb 2019 14:47:48 +0000 (17:47 +0300)
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Sat, 2 Feb 2019 14:47:48 +0000 (17:47 +0300)
Compiling GnuTLS with no p11-kit installed will result in a serie of
warnings during build time because mech-list.h will be generated even if
pkcs11 tool compilation is disabled. Move mech-list.h generation to
happen only if pkcs11 is enabled, thus removing these warnings.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
src/Makefile.am

index eb3c578648cccadc66649506d8ed4111203488e7..0374924c5377efb0a24b5977e486d691406b44c3 100644 (file)
@@ -56,7 +56,7 @@ ARGS_STAMPS = \
        systemkey-args.stamp srptool-args.stamp ocsptool-args.stamp p11tool-args.stamp \
        danetool-args.stamp serv-args.stamp psktool-args.stamp
 
-BUILT_SOURCES = $(ARGS_BUILT) mech-list.h
+BUILT_SOURCES = $(ARGS_BUILT)
 
 DISTCLEANFILES = $(BUILT_SOURCES) $(ARGS_STAMPS)
 
@@ -226,8 +226,9 @@ libcmd_danetool_la_LIBADD += $(INET_PTON_LIB) $(LIB_CLOCK_GETTIME)
 # p11 tool
 if ENABLE_PKCS11
 
+BUILT_SOURCES += mech-list.h
 p11tool_SOURCES = p11tool-args.def p11tool.c pkcs11.c certtool-common.c \
-       certtool-extras.c p11tool.h common.c
+       certtool-extras.c p11tool.h common.c mech-list.h
 p11tool_LDADD = ../lib/libgnutls.la
 p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la gl/libgnu_gpl.la
 p11tool_LDADD += $(COMMON_LIBS)