File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -150,11 +150,11 @@ check-local: $(check_PROGRAMS)
150
150
RES=0; for P in $? ; do $( VALGRIND) ./$$ P || { RES=$$ ? ; echo " FAILED: $( VALGRIND) ./$$ P" >&2 ; }; done ; exit $$ RES
151
151
endif WITH_VALGRIND
152
152
153
+ # NOTE: libnutclientstub includes libnutclient and adds nutclientmem
153
154
cppunittest_CXXFLAGS = $(AM_CXXFLAGS ) $(CPPUNIT_CFLAGS ) $(CPPUNIT_CXXFLAGS ) $(CPPUNIT_NUT_CXXFLAGS ) $(CXXFLAGS )
154
155
# ##cppunittest_CXXFLAGS += -I$(top_srcdir)/include -DTOP_SRCDIR="\"$(top_srcdir)\""
155
156
cppunittest_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
158
158
cppunittest_SOURCES = $(CPPUNITTESTSRC ) $(CPPUNITTESTERSRC )
159
159
160
160
# Currently nutconf and related codebase causes woes for static analysis
@@ -166,7 +166,7 @@ endif WITH_NUTCONF
166
166
167
167
cppnit_CXXFLAGS = $(AM_CXXFLAGS ) $(CPPUNIT_CFLAGS ) $(CPPUNIT_CXXFLAGS ) $(CPPUNIT_NUT_CXXFLAGS ) $(CXXFLAGS )
168
168
cppnit_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
170
170
cppnit_SOURCES = $(CPPCLIENTTESTSRC ) $(CPPUNITTESTERSRC )
171
171
172
172
# Make sure out-of-dir C++ dependencies exist (especially when dev-building
You can’t perform that action at this time.
0 commit comments