From 1c4751191c2ec16c9da29021eec694165ecb3443 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Tue, 29 Apr 2025 22:50:31 +0200 Subject: [PATCH] tests/Makefile.am: restructure and comment cppunittest_LDADD and cppnit_LDADD [#2744] One positive result of experiments in PR #2744 which otherwise did not lead far, yet... Signed-off-by: Jim Klimov --- tests/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 508f081cd6..811762725b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -152,11 +152,12 @@ TESTS += $(TESTS_CXX11) # Note: we only build it, but do not run directly (NIT prepares the sandbox) check_PROGRAMS += cppnit +# NOTE: libnutclientstub includes libnutclient and adds nutclientmem cppunittest_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS) ###cppunittest_CXXFLAGS += -I$(top_srcdir)/include -DTOP_SRCDIR="\"$(top_srcdir)\"" cppunittest_LDFLAGS = $(CPPUNIT_LDFLAGS) $(CPPUNIT_LIBS) -cppunittest_LDADD = $(top_builddir)/clients/libnutclient.la -cppunittest_LDADD += $(top_builddir)/clients/libnutclientstub.la +cppunittest_LDADD = $(top_builddir)/clients/libnutclientstub.la +cppunittest_LDADD += $(top_builddir)/clients/libnutclient.la cppunittest_SOURCES = $(CPPUNITTESTSRC) $(CPPUNITTESTERSRC) # Currently nutconf and related codebase causes woes for static analysis @@ -168,7 +169,8 @@ endif WITH_LIBNUTCONF cppnit_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS) cppnit_LDFLAGS = $(CPPUNIT_LDFLAGS) $(CPPUNIT_LIBS) -cppnit_LDADD = $(top_builddir)/clients/libnutclient.la $(top_builddir)/clients/libnutclientstub.la +cppnit_LDADD = $(top_builddir)/clients/libnutclientstub.la +cppnit_LDADD += $(top_builddir)/clients/libnutclient.la cppnit_SOURCES = $(CPPCLIENTTESTSRC) $(CPPUNITTESTERSRC) # Make sure out-of-dir C++ dependencies exist (especially when dev-building