From: Yannick Lamarre Date: Fri, 22 Feb 2019 19:33:37 +0000 (-0500) Subject: Fix: Add POPT_CFLAGS to lttng_CFLAGS X-Git-Tag: v2.10.7~20 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=10575a02757cace48c4fb585a46bf5f28b937b3d;p=lttng-tools.git Fix: Add POPT_CFLAGS to lttng_CFLAGS The generated makefile was ignoring POPT_CFLAGS when compiling lttng, but was adding POPT_LIBS to lttng_LDADD. With this commit, make now honors both settings for applications and tests. Fixes: #1165 Signed-off-by: Yannick Lamarre Signed-off-by: Jérémie Galarneau --- diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am index 1a6977eb5..599170f41 100644 --- a/src/bin/lttng/Makefile.am +++ b/src/bin/lttng/Makefile.am @@ -25,6 +25,8 @@ lttng_SOURCES = command.h conf.c conf.h commands/start.c \ commands/help.c \ utils.c utils.h lttng.c +lttng_CFLAGS = $(AM_CFLAGS) $(POPT_CFLAGS) + lttng_LDADD = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(top_builddir)/src/common/libcommon.la \ $(top_builddir)/src/common/config/libconfig.la \ diff --git a/tests/regression/kernel/Makefile.am b/tests/regression/kernel/Makefile.am index c4ee44390..7c7d06fdc 100644 --- a/tests/regression/kernel/Makefile.am +++ b/tests/regression/kernel/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST = test_event_basic test_all_events test_syscall \ noinst_PROGRAMS = select_poll_epoll select_poll_epoll_SOURCES = select_poll_epoll.c select_poll_epoll_LDADD = $(POPT_LIBS) -select_poll_epoll_CFLAGS = -fno-stack-protector -D_FORTIFY_SOURCE=0 $(AM_CFLAGS) +select_poll_epoll_CFLAGS = $(POPT_CFLAGS) -fno-stack-protector -D_FORTIFY_SOURCE=0 $(AM_CFLAGS) all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \