mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-16 20:56:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

automake: Consistently include $(AM_CFLAGS) in target-specific CFLAGS

Browse Source 
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>
This commit is contained in:
Simon McVittie
2022-10-25 09:26:28 +01:00
committed by Simon McVittie
parent 190bad06d2
commit de4de4dc44
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -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
icon-validator/Makefile.am.inc
View File

@@ -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)\"

4
revokefs/Makefile.am.inc
View File

@@ -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)