diff options
| author | Philip Withnall <withnall@endlessm.com> | 2017-07-06 14:34:13 +0100 |
|---|---|---|
| committer | Philip Withnall <withnall@endlessm.com> | 2017-07-06 15:05:58 +0100 |
| commit | f47a69639247177364f3f66ccead509cd621ee33 (patch) | |
| tree | 9ab42f0926f72cee9faa6170f46ea8318a383a86 /session-helper/Makefile.am.inc | |
| parent | 95c3c942d3bd17383feca86783f273ae36f98b0b (diff) | |
| download | flatpak-f47a69639247177364f3f66ccead509cd621ee33.tar.gz | |
build: Add AM_* variables to all per-target special variables
For example, add $(AM_CFLAGS) to mumble_CFLAGS. Since $(WARN_CFLAGS) is
only added to $(AM_CFLAGS), this fixes the lack of inclusion of the
compiler warning flags in the compilation of half of flatpak.
Note that $(AM_*) variables are only used by automake if a more specific
(per-target) special variable is not defined instead. So if you define
mumble_CFLAGS, AM_CFLAGS will not be used for that target unless
explicitly included in mumble_CFLAGS.
See
https://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html.
Do the same for $(AM_LIBADD), $(AM_LDFLAGS), etc. These are not
currently defined, but it’s good practice to include them in
mumble_LIBADD (etc.) just in case they’re defined in future. Hopefully
their inclusions will be cargo-culted to any new targets which are
added, retaining full coverage of the code base.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Diffstat (limited to 'session-helper/Makefile.am.inc')
| -rw-r--r-- | session-helper/Makefile.am.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc index 4a51f150..ed2d5341 100644 --- a/session-helper/Makefile.am.inc +++ b/session-helper/Makefile.am.inc @@ -12,5 +12,5 @@ flatpak_session_helper_SOURCES = \ session-helper/flatpak-session-helper.c \ $(NULL) -flatpak_session_helper_LDADD = $(BASE_LIBS) libflatpak-common.la -flatpak_session_helper_CFLAGS = $(BASE_CFLAGS) $(SOUP_CFLAGS) $(OSTREE_CFLAGS) $(GSYSTEM_CFLAGS) $(JSON_CFLAGS) +flatpak_session_helper_LDADD = $(AM_LDADD) $(BASE_LIBS) libflatpak-common.la +flatpak_session_helper_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(SOUP_CFLAGS) $(OSTREE_CFLAGS) $(GSYSTEM_CFLAGS) $(JSON_CFLAGS) |