From f541e7719eb04ca3795209da2642419414d26709 Mon Sep 17 00:00:00 2001 From: Yannick Lamarre Date: Fri, 22 Feb 2019 14:33:37 -0500 Subject: [PATCH] Fix: Add POPT_CFLAGS to lttng_CFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/bin/lttng/Makefile.am | 2 ++ tests/regression/kernel/Makefile.am | 2 +- tests/regression/ust/multi-lib/Makefile.am | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am index b0e1247d2..62ae05937 100644 --- a/src/bin/lttng/Makefile.am +++ b/src/bin/lttng/Makefile.am @@ -28,6 +28,8 @@ lttng_SOURCES = command.h conf.c conf.h commands/start.c \ commands/disable_rotation.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 a787e4fa5..3ab6d75bd 100644 --- a/tests/regression/kernel/Makefile.am +++ b/tests/regression/kernel/Makefile.am @@ -7,7 +7,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 \ diff --git a/tests/regression/ust/multi-lib/Makefile.am b/tests/regression/ust/multi-lib/Makefile.am index 3fb4ae74e..17ccf3e64 100644 --- a/tests/regression/ust/multi-lib/Makefile.am +++ b/tests/regression/ust/multi-lib/Makefile.am @@ -3,13 +3,13 @@ EXTRA_DIST = test_multi_lib noinst_PROGRAMS = exec-with-callsites exec-without-callsites exec_with_callsites_SOURCES = multi-lib-test.c callsites.c -exec_with_callsites_LDFLAGS = -ldl -lpopt -exec_with_callsites_CFLAGS = $(AM_CFLAGS) -DHAS_CALLSITES=1 +exec_with_callsites_LDFLAGS = -ldl $(POPT_LIBS) +exec_with_callsites_CFLAGS = $(POPT_CFLAGS) $(AM_CFLAGS) -DHAS_CALLSITES=1 exec_without_callsites_SOURCES = multi-lib-test.c -exec_without_callsites_LDFLAGS = -ldl -lpopt -llttng-ust +exec_without_callsites_LDFLAGS = -ldl $(POPT_LIBS) -llttng-ust exec_without_callsites_LDADD = probes.o -exec_without_callsites_CFLAGS = $(AM_CFLAGS) -DHAS_CALLSITES=0 +exec_without_callsites_CFLAGS = $(POPT_CFLAGS) $(AM_CFLAGS) -DHAS_CALLSITES=0 PROBES_SRC=probes.c probes.h PROBES_LDF=-shared -module -llttng-ust -avoid-version -rpath $(abs_builddir)/.libs/ -- 2.34.1