diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-10-25 09:26:28 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2022-10-27 09:59:43 +0100 |
| commit | de4de4dc440135b640bf6e011e673380f1a2bd48 (patch) | |
| tree | cfcfa39355f3c0f1809ac3c5bb34b5e11c5cdfe3 | |
| parent | 190bad06d25fbffaf6674128ff37ba15fba30fba (diff) | |
| download | flatpak-de4de4dc440135b640bf6e011e673380f1a2bd48.tar.gz | |
automake: Consistently include $(AM_CFLAGS) in target-specific CFLAGS
When built for i386 with Autotools, this would have detected the format
string issue fixed in #5148.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | icon-validator/Makefile.am.inc | 2 | ||||
| -rw-r--r-- | revokefs/Makefile.am.inc | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 00b72cc0..dd5e8213 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ INTERNAL_GPGME_LIBS = $(DEP_GPGME_LIBS) $(GPGME_PTHREAD_LIBS) lib_LTLIBRARIES = noinst_LTLIBRARIES += libglnx.la libglnx_srcpath := $(srcdir)/subprojects/libglnx +# This intentionally does not include AM_CFLAGS, libglnx always uses those libglnx_cflags := \ $(BASE_CFLAGS) \ "-I$(libglnx_srcpath)" \ diff --git a/icon-validator/Makefile.am.inc b/icon-validator/Makefile.am.inc index 3282e42c..8bbc7998 100644 --- a/icon-validator/Makefile.am.inc +++ b/icon-validator/Makefile.am.inc @@ -6,4 +6,4 @@ libexec_PROGRAMS += \ flatpak_validate_icon_SOURCES = icon-validator/validate-icon.c flatpak_validate_icon_LDADD = $(GDK_PIXBUF_LIBS) -flatpak_validate_icon_CFLAGS = $(GDK_PIXBUF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" +flatpak_validate_icon_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" diff --git a/revokefs/Makefile.am.inc b/revokefs/Makefile.am.inc index 6fc9c946..926f1410 100644 --- a/revokefs/Makefile.am.inc +++ b/revokefs/Makefile.am.inc @@ -26,9 +26,9 @@ noinst_PROGRAMS += revokefs-demo revokefs_fuse_SOURCES = revokefs/main.c revokefs/writer.c revokefs/writer.h -revokefs_fuse_CFLAGS = $(BASE_CFLAGS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(FUSE_CFLAGS) +revokefs_fuse_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(FUSE_CFLAGS) revokefs_fuse_LDADD = libglnx.la $(BASE_LIBS) $(FUSE_LIBS) revokefs_demo_SOURCES = revokefs/demo.c -revokefs_demo_CFLAGS = $(BASE_CFLAGS) +revokefs_demo_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) revokefs_demo_LDADD = $(BASE_LIBS) |