X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2FMakefile.am;h=a59ee8d6daeb825e4e3e29c07f4f2bbad70f8831;hp=2f1a9174e9a867cb7f9cbcf712e0b5144120c062;hb=6a5596ac51788ca040b88b98e59c8db42a5a160a;hpb=a6bc4ca9d659caf016ef932fcd944029737ac57c diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am index 2f1a9174e..a59ee8d6d 100644 --- a/tests/regression/tools/notification/Makefile.am +++ b/tests/regression/tools/notification/Makefile.am @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -AM_CFLAGS += -I$(top_srcdir)/tests/utils +AM_CPPFLAGS += -I$(top_srcdir)/tests/utils LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la LIB_LTTNG_CTL = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la @@ -14,7 +14,7 @@ EXTRA_DIST = \ base_client.c \ consumer_testpoints.cpp \ sessiond_testpoints.cpp \ - notification.c \ + notification.cpp \ test_notification_kernel_buffer_usage \ test_notification_kernel_capture \ test_notification_kernel_error \ @@ -38,14 +38,14 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \ libpause_consumer_la_SOURCES = consumer_testpoints.cpp libpause_consumer_la_LIBADD = \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(DL_LIBS) libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS) libpause_sessiond_la_SOURCES = sessiond_testpoints.cpp libpause_sessiond_la_LIBADD = \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(DL_LIBS) libpause_sessiond_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS) @@ -54,16 +54,16 @@ noinst_LTLIBRARIES = libpause_sessiond.la libpause_consumer.la base_client_SOURCES = base_client.c base_client_LDADD = $(LIB_LTTNG_CTL) -notification_SOURCES = notification.c +notification_SOURCES = notification.cpp # Tests the deprecated lttng_register_trigger() interface -notification_CFLAGS = -Wno-deprecated-declarations $(AM_CFLAGS) +notification_CXXFLAGS = -Wno-deprecated-declarations $(AM_CXXFLAGS) notification_LDADD = $(LIB_LTTNG_CTL) $(LIBTAP) -lm rotation_SOURCES = rotation.c rotation_LDADD = $(LIB_LTTNG_CTL) $(LIBTAP) -lm default_pipe_size_getter_SOURCES = default_pipe_size_getter.cpp -default_pipe_size_getter_LDADD = $(top_builddir)/src/common/libcommon.la +default_pipe_size_getter_LDADD = $(top_builddir)/src/common/libcommon-gpl.la noinst_SCRIPTS = \ test_notification_kernel_buffer_usage \