Skip to content

Commit 8bb23fd

Browse files
committed
tests/Makefile.am: do not LDADD libnutclient.la where we (also) use libnutclientstub.la
Avoid linker warning: CXXLD cppnit ld: warning: file /export/home/abuild/nut/obj/nut-2.8.2.1775.28/_build/sub/clients/.libs/libnutclient.so: linked to ../clients/.libs/libnutclient.so: attempted multiple inclusion of file Signed-off-by: Jim Klimov <[email protected]>
1 parent 4e9eb9a commit 8bb23fd

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tests/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff 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
151151
endif WITH_VALGRIND
152152

153+
# NOTE: libnutclientstub includes libnutclient and adds nutclientmem
153154
cppunittest_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS)
154155
###cppunittest_CXXFLAGS += -I$(top_srcdir)/include -DTOP_SRCDIR="\"$(top_srcdir)\""
155156
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
158158
cppunittest_SOURCES = $(CPPUNITTESTSRC) $(CPPUNITTESTERSRC)
159159

160160
# Currently nutconf and related codebase causes woes for static analysis
@@ -166,7 +166,7 @@ endif WITH_NUTCONF
166166

167167
cppnit_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS)
168168
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
170170
cppnit_SOURCES = $(CPPCLIENTTESTSRC) $(CPPUNITTESTERSRC)
171171

172172
# Make sure out-of-dir C++ dependencies exist (especially when dev-building

0 commit comments

Comments
 (0)