Skip to content

Commit 5f8c84f

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 66ed615 commit 5f8c84f

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
@@ -145,11 +145,11 @@ TESTS += $(TESTS_CXX11)
145145
# Note: we only build it, but do not run directly (NIT prepares the sandbox)
146146
check_PROGRAMS += cppnit
147147

148+
# NOTE: libnutclientstub includes libnutclient and adds nutclientmem
148149
cppunittest_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS)
149150
###cppunittest_CXXFLAGS += -I$(top_srcdir)/include -DTOP_SRCDIR="\"$(top_srcdir)\""
150151
cppunittest_LDFLAGS = $(CPPUNIT_LDFLAGS) $(CPPUNIT_LIBS)
151-
cppunittest_LDADD = $(top_builddir)/clients/libnutclient.la
152-
cppunittest_LDADD += $(top_builddir)/clients/libnutclientstub.la
152+
cppunittest_LDADD = $(top_builddir)/clients/libnutclientstub.la
153153
cppunittest_SOURCES = $(CPPUNITTESTSRC) $(CPPUNITTESTERSRC)
154154

155155
# Currently nutconf and related codebase causes woes for static analysis
@@ -161,7 +161,7 @@ endif WITH_NUTCONF
161161

162162
cppnit_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS)
163163
cppnit_LDFLAGS = $(CPPUNIT_LDFLAGS) $(CPPUNIT_LIBS)
164-
cppnit_LDADD = $(top_builddir)/clients/libnutclient.la $(top_builddir)/clients/libnutclientstub.la
164+
cppnit_LDADD = $(top_builddir)/clients/libnutclientstub.la
165165
cppnit_SOURCES = $(CPPCLIENTTESTSRC) $(CPPUNITTESTERSRC)
166166

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

0 commit comments

Comments
 (0)