From b40714634099d8a6ba342397a29ca20b50128c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Thu, 16 Sep 2021 15:39:00 +0400
Subject: [PATCH] build-sys: add missing AM_CFLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some binaries are being built without configure time CFLAGS, fix it.
Upstream commit is cab1e2186fa6f73ffe5848362d5f7c5a2c555bdb ("build-sys:
Add MY_CFLAGS, CFLAGS, and MY_LDFLAGS to all Makefile.am's") and earlier.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
src/swtpm_bios/Makefile.am | 3 ++-
src/swtpm_cert/Makefile.am | 3 ++-
src/swtpm_ioctl/Makefile.am | 3 ++-
src/swtpm_setup/Makefile.am | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/swtpm_bios/Makefile.am b/src/swtpm_bios/Makefile.am
index c7c3016..a6c7166 100644
--- a/src/swtpm_bios/Makefile.am
+++ b/src/swtpm_bios/Makefile.am
@@ -13,7 +13,8 @@ bin_PROGRAMS = \
swtpm_bios_CFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
- $(HARDENING_CFLAGS)
+ $(HARDENING_CFLAGS) \
+ @AM_CFLAGS@
swtpm_bios_LDFLAGS = \
$(HARDENING_LDFLAGS)
diff --git a/src/swtpm_cert/Makefile.am b/src/swtpm_cert/Makefile.am
index bf0d8b7..74e4d2a 100644
--- a/src/swtpm_cert/Makefile.am
+++ b/src/swtpm_cert/Makefile.am
@@ -18,7 +18,8 @@ swtpm_cert_SOURCES = \
swtpm_cert_CFLAGS = \
-I$(top_builddir)/include \
- -I$(top_srcdir)/include
+ -I$(top_srcdir)/include \
+ @AM_CFLAGS@
ek-cert.o : tpm_asn1.h
diff --git a/src/swtpm_ioctl/Makefile.am b/src/swtpm_ioctl/Makefile.am
index cc8388c..3b722bd 100644
--- a/src/swtpm_ioctl/Makefile.am
+++ b/src/swtpm_ioctl/Makefile.am
@@ -14,7 +14,8 @@ swtpm_ioctl_SOURCES = tpm_ioctl.c
swtpm_ioctl_CFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
- $(HARDENING_CFLAGS)
+ $(HARDENING_CFLAGS) \
+ @AM_CFLAGS@
swtpm_ioctl_LDFLAGS = \
$(HARDENING_LDFLAGS)
diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
index 045bdb1..5696dde 100644
--- a/src/swtpm_setup/Makefile.am
+++ b/src/swtpm_setup/Makefile.am
@@ -40,7 +40,8 @@ swtpm_setup_CFLAGS = \
-I$(top_srcdir)/src/utils \
$(HARDENING_CFLAGS) \
$(GLIB_CFLAGS) \
- $(JSON_GLIB_CFLAGS)
+ $(JSON_GLIB_CFLAGS) \
+ @AM_CFLAGS@
EXTRA_DIST = \
README
--
2.33.0.113.g6c40894d24