Skip to content

Commit

Permalink
automake: Consistently include $(AM_CFLAGS) in target-specific CFLAGS
Browse files Browse the repository at this point in the history
When built for i386 with Autotools, this would have detected the format
string issue fixed in #5148.

Signed-off-by: Simon McVittie <[email protected]>
(cherry picked from commit de4de4d)
  • Loading branch information
smcv committed Nov 17, 2022
1 parent 414bbfd commit 93c7036
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -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)" \
2 changes: 1 addition & 1 deletion icon-validator/Makefile.am.inc
Original file line number Diff line number Diff line change
@@ -4,4 +4,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)\"
4 changes: 2 additions & 2 deletions revokefs/Makefile.am.inc
Original file line number Diff line number Diff line change
@@ -24,9 +24,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)

0 comments on commit 93c7036

Please sign in to comment.