File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -150,11 +150,11 @@ check-local: $(check_PROGRAMS)
150150 RES=0; for P in $? ; do $( VALGRIND) ./$$ P || { RES=$$ ? ; echo " FAILED: $( VALGRIND) ./$$ P" >&2 ; }; done ; exit $$ RES
151151endif WITH_VALGRIND
152152
153+ # NOTE: libnutclientstub includes libnutclient and adds nutclientmem
153154cppunittest_CXXFLAGS = $(AM_CXXFLAGS ) $(CPPUNIT_CFLAGS ) $(CPPUNIT_CXXFLAGS ) $(CPPUNIT_NUT_CXXFLAGS ) $(CXXFLAGS )
154155# ##cppunittest_CXXFLAGS += -I$(top_srcdir)/include -DTOP_SRCDIR="\"$(top_srcdir)\""
155156cppunittest_LDFLAGS = $(CPPUNIT_LDFLAGS ) $(CPPUNIT_LIBS )
156- cppunittest_LDADD = $(top_builddir ) /clients/libnutclient.la
157- cppunittest_LDADD += $(top_builddir ) /clients/libnutclientstub.la
157+ cppunittest_LDADD = $(top_builddir ) /clients/libnutclientstub.la
158158cppunittest_SOURCES = $(CPPUNITTESTSRC ) $(CPPUNITTESTERSRC )
159159
160160# Currently nutconf and related codebase causes woes for static analysis
@@ -166,7 +166,7 @@ endif WITH_NUTCONF
166166
167167cppnit_CXXFLAGS = $(AM_CXXFLAGS ) $(CPPUNIT_CFLAGS ) $(CPPUNIT_CXXFLAGS ) $(CPPUNIT_NUT_CXXFLAGS ) $(CXXFLAGS )
168168cppnit_LDFLAGS = $(CPPUNIT_LDFLAGS ) $(CPPUNIT_LIBS )
169- cppnit_LDADD = $( top_builddir ) /clients/libnutclient.la $(top_builddir ) /clients/libnutclientstub.la
169+ cppnit_LDADD = $(top_builddir ) /clients/libnutclientstub.la
170170cppnit_SOURCES = $(CPPCLIENTTESTSRC ) $(CPPUNITTESTERSRC )
171171
172172# Make sure out-of-dir C++ dependencies exist (especially when dev-building
You can’t perform that action at this time.
0 commit comments