build-sys: Add HARDENING_CFLAGS and _LDFLAGS to all C programs

Add the HARDENING_CFLAGS and _LDFLAGS to all C programs.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

diff --git a/samples/Makefile.am b/samples/Makefile.am
index 1a7df0011033bada1205b08b0eb709ddd7ca5166..dcbc9b633dc6a0455270e1eea8ef9c1668630127 100644 (file)
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -39,10 +39,12 @@ swtpm_localca_LDADD = \
 
 swtpm_localca_LDFLAGS = \
        -L$(top_builddir)/src/utils -lswtpm_utils \
+       $(HARDENING_LDFLAGS) \
        $(GLIB_LIBS)
 
 swtpm_localca_CFLAGS = \
        -I$(top_srcdir)/src/utils \
+       $(HARDENING_CFLAGS) \
        $(GLIB_CFLAGS)
 
 install-data-local:

diff --git a/src/swtpm_bios/Makefile.am b/src/swtpm_bios/Makefile.am
index a5ba2f24f7f6ac89a73ca6ef0b51a8d65630ff40..c7c301611075e36822d830c13684a781d6943f41 100644 (file)
--- a/src/swtpm_bios/Makefile.am
+++ b/src/swtpm_bios/Makefile.am
@@ -12,7 +12,11 @@ bin_PROGRAMS = \
 
 swtpm_bios_CFLAGS = \
        -I$(top_builddir)/include \
-       -I$(top_srcdir)/include
+       -I$(top_srcdir)/include \
+       $(HARDENING_CFLAGS)
+
+swtpm_bios_LDFLAGS = \
+       $(HARDENING_LDFLAGS)
 
 swtpm_bios_SOURCES = tpm_bios.c
 

diff --git a/src/swtpm_ioctl/Makefile.am b/src/swtpm_ioctl/Makefile.am
index e0253a264c5564dc35c4508a30e6b2e3100b69a1..cc8388c9b956c58367b4419fab8bf304d581b1d4 100644 (file)
--- a/src/swtpm_ioctl/Makefile.am
+++ b/src/swtpm_ioctl/Makefile.am
@@ -13,7 +13,11 @@ swtpm_ioctl_SOURCES = tpm_ioctl.c
 
 swtpm_ioctl_CFLAGS = \
        -I$(top_builddir)/include \
-       -I$(top_srcdir)/include
+       -I$(top_srcdir)/include \
+       $(HARDENING_CFLAGS)
+
+swtpm_ioctl_LDFLAGS = \
+       $(HARDENING_LDFLAGS)
 
 EXTRA_DIST = \
        README

diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 8e614c6d17130ef289d816dd29a648422a939239..0780a6ce45d0eb85687c5fed195afbee03644417 100644 (file)
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -11,7 +11,11 @@ noinst_LTLIBRARIES = \
        libswtpm_utils.la
 
 libswtpm_utils_la_CFLAGS = \
+       $(HARDENING_CFLAGS) \
        $(GLIB_CFLAGS)
 
+libswtpm_utils_la_LDFLAGS = \
+       $(HARDENING_LDFLAGS)
+
 libswtpm_utils_la_SOURCES = \
        swtpm_utils.c