Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
d17813bd
Commit
d17813bd
authored
Jun 12, 2012
by
Marcin Siodelski
Browse files
[1955] Disable unused-parameter warning in dhcp for clang.
parent
6ae6562d
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/Makefile.am
View file @
d17813bd
...
...
@@ -32,6 +32,10 @@ pkglibexec_PROGRAMS = b10-dhcp4
b10_dhcp4_SOURCES
=
main.cc dhcp4_srv.cc dhcp4_srv.h
if
USE_CLANGPP
b10_dhcp4_CXXFLAGS
=
-Wno-unused-parameter
endif
b10_dhcp4_LDADD
=
$(top_builddir)
/src/lib/dhcp/libdhcp++.la
b10_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
b10_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
...
...
src/bin/dhcp4/tests/Makefile.am
View file @
d17813bd
...
...
@@ -34,6 +34,10 @@ dhcp4_unittests_SOURCES = ../dhcp4_srv.h ../dhcp4_srv.cc
dhcp4_unittests_SOURCES
+=
dhcp4_unittests.cc
dhcp4_unittests_SOURCES
+=
dhcp4_srv_unittest.cc
if
USE_CLANGPP
dhcp4_unittests_CXXFLAGS
=
-Wno-unused-parameter
endif
dhcp4_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
dhcp4_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
dhcp4_unittests_LDADD
=
$(GTEST_LDADD)
...
...
src/bin/dhcp6/Makefile.am
View file @
d17813bd
...
...
@@ -34,6 +34,10 @@ pkglibexec_PROGRAMS = b10-dhcp6
b10_dhcp6_SOURCES
=
main.cc dhcp6_srv.cc dhcp6_srv.h
if
USE_CLANGPP
b10_dhcp6_CXXFLAGS
=
-Wno-unused-parameter
endif
b10_dhcp6_LDADD
=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
d17813bd
...
...
@@ -47,6 +47,10 @@ dhcp6_unittests_SOURCES = ../dhcp6_srv.h ../dhcp6_srv.cc
dhcp6_unittests_SOURCES
+=
dhcp6_unittests.cc
dhcp6_unittests_SOURCES
+=
dhcp6_srv_unittest.cc
if
USE_CLANGPP
dhcp6_unittests_CXXFLAGS
=
-Wno-unused-parameter
endif
dhcp6_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
dhcp6_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
dhcp6_unittests_LDADD
=
$(GTEST_LDADD)
...
...
@@ -55,6 +59,7 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libdhcp++.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
endif
noinst_PROGRAMS
=
$(TESTS)
src/lib/dhcp/Makefile.am
View file @
d17813bd
...
...
@@ -31,4 +31,7 @@ libdhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
libdhcp___la_LIBADD
=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
libdhcp___la_LIBADD
+=
$(top_builddir)
/src/lib/util/libutil.la
libdhcp___la_LDFLAGS
=
-no-undefined
-version-info
1:0:0
libdhcp___la_LDFLAGS
+=
$(CLOCK_GETTIME_LDFLAGS)
if
USE_CLANGPP
libdhcp___la_CXXFLAGS
+=
-Wno-unused-parameter
endif
src/lib/dhcp/tests/Makefile.am
View file @
d17813bd
...
...
@@ -33,14 +33,14 @@ libdhcp___unittests_SOURCES += ../pkt6.h ../pkt6.cc pkt6_unittest.cc
libdhcp___unittests_SOURCES
+=
../pkt4.h ../pkt4.cc pkt4_unittest.cc
libdhcp___unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
$(LOG4CPLUS_INCLUDES)
libdhcp___unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(CLOCK_GETTIME_LDFLAGS)
libdhcp___unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
libdhcp___unittests_CXXFLAGS
=
$(AM_CXXFLAGS)
if
USE_CLANGPP
# This is to workaround unused variables tcout and tcerr in
# log4cplus's streams.h.
libdhcp___unittests_CXXFLAGS
+=
-Wno-unused-variable
# log4cplus's streams.h
and unused parameters from boost::posix_time
.
libdhcp___unittests_CXXFLAGS
+=
-Wno-unused-variable
-Wno-unused-parameter
endif
libdhcp___unittests_LDADD
=
$(GTEST_LDADD)
libdhcp___unittests_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
...
...
tests/tools/perfdhcp/tests/Makefile.am
View file @
d17813bd
...
...
@@ -4,9 +4,8 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
AM_LDFLAGS
=
$(CLOCK_GETTIME_LDFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
+
=
-static
AM_LDFLAGS
=
-static
endif
CLEANFILES
=
*
.gcno
*
.gcda
...
...
@@ -27,6 +26,10 @@ run_unittests_SOURCES += $(top_builddir)/tests/tools/perfdhcp/perf_pkt4.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
if
USE_CLANGPP
run_unittests_CXXFLAGS
=
-Wno-unused-parameter
endif
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment