summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2022-01-16 16:48:14 +0000
committerDaiki Ueno <ueno@gnu.org>2022-01-16 16:48:14 +0000
commit0a673a028506c6bff961c41992fb25baa1a11509 (patch)
treef68b4d6970db214e4caf7cc5cdea8f72a11cb4a4 /src
parent6000b2d93b6cb9acd45adc9b4d8f7bf2f1cb49b2 (diff)
parent1b06c7fef0cea21e4f7094f89cd2649c55361413 (diff)
downloadgnutls-0a673a028506c6bff961c41992fb25baa1a11509.tar.gz
Merge branch 'wip/dueno/build-fixes3' into 'master'
Minor build fixes for 3.7.3 release (part 2) See merge request gnutls/gnutls!1516
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d867b02013..dabc97c0a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,8 +68,6 @@ if ENABLE_DANE
bin_PROGRAMS += danetool
endif
-noinst_PROGRAMS = systemkey
-
if ENABLE_PKCS11
# TPM makes use of PKCS #11 callbacks
@@ -81,7 +79,7 @@ bin_PROGRAMS += p11tool
endif
noinst_LTLIBRARIES =
-
+noinst_PROGRAMS =
if ENABLE_SRP
srptool_SOURCES = srptool.c
@@ -216,6 +214,7 @@ libcmd_tpmtool_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) $(LIB_CLOCK_GETTIM
endif # ENABLE_TROUSERS
+noinst_PROGRAMS += systemkey
systemkey_SOURCES = systemkey.c certtool-common.c common.c
systemkey_LDADD = ../lib/libgnutls.la
systemkey_LDADD += libcmd-systemkey.la ../gl/libgnu.la gl/libgnu_gpl.la
@@ -230,7 +229,7 @@ noinst_LTLIBRARIES += libcerttool-cfg.la
libcerttool_cfg_la_SOURCES = certtool-cfg.h certtool-cfg.c cfg.c cfg.h
libcerttool_cfg_la_LIBADD = ../gl/libgnu.la gl/libgnu_gpl.la
-noinst_PROGRAMS = dumpcfg
+noinst_PROGRAMS += dumpcfg
dumpcfg_SOURCES = cfg.c cfg.h
dumpcfg_CFLAGS = -DTEST=1
dumpcfg_LDADD = ../gl/libgnu.la gl/libgnu_gpl.la