Skip to content
GitLab
Menu
Projects
Groups
Snippets
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
03681966
Commit
03681966
authored
Aug 31, 2015
by
Francis Dupont
Browse files
[3911a] Fixes for static link (still subject to #4004 issue)
parent
0dab9beb
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/bin/d2/Makefile.am
View file @
03681966
...
...
@@ -111,7 +111,7 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libkea-exceptions.la
kea_dhcp_ddns_LDADD
+=
$(LOG4CPLUS_LIBS)
$(CRYPTO_LIBS)
kea_dhcp_ddns_LDFLAGS
=
$(CRYPTO_LDFLAGS)
kea_dhcp_ddns_LDFLAGS
=
$(AM_LDFLAGS)
$(CRYPTO_LDFLAGS)
if
HAVE_MYSQL
kea_dhcp_ddns_LDFLAGS
+=
$(MYSQL_LIBS)
endif
...
...
src/bin/dhcp4/Makefile.am
View file @
03681966
...
...
@@ -89,7 +89,7 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libkea-exceptions.la
kea_dhcp4_LDADD
+=
$(LOG4CPLUS_LIBS)
$(CRYPTO_LIBS)
kea_dhcp4_LDFLAGS
=
$(CRYPTO_LDFLAGS)
kea_dhcp4_LDFLAGS
=
$(AM_LDFLAGS)
$(CRYPTO_LDFLAGS)
if
HAVE_MYSQL
kea_dhcp4_LDFLAGS
+=
$(MYSQL_LIBS)
endif
...
...
src/bin/dhcp4/tests/Makefile.am
View file @
03681966
...
...
@@ -36,6 +36,10 @@ if USE_CLANGPP
AM_CXXFLAGS
+=
-Wno-unused-parameter
endif
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
endif
TESTS_ENVIRONMENT
=
\
$(LIBTOOL)
--mode
=
execute
$(VALGRIND_COMMAND)
...
...
src/bin/dhcp6/Makefile.am
View file @
03681966
...
...
@@ -90,7 +90,7 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libkea-exceptions.la
kea_dhcp6_LDADD
+=
$(LOG4CPLUS_LIBS)
$(CRYPTO_LIBS)
kea_dhcp6_LDFLAGS
=
$(CRYPTO_LDFLAGS)
kea_dhcp6_LDFLAGS
=
$(AM_LDFLAGS)
$(CRYPTO_LDFLAGS)
if
HAVE_MYSQL
kea_dhcp6_LDFLAGS
+=
$(MYSQL_LIBS)
endif
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
03681966
...
...
@@ -37,6 +37,10 @@ if USE_CLANGPP
AM_CXXFLAGS
+=
-Wno-unused-parameter
endif
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
endif
TESTS_ENVIRONMENT
=
\
$(LIBTOOL)
--mode
=
execute
$(VALGRIND_COMMAND)
...
...
src/bin/lfc/Makefile.am
View file @
03681966
...
...
@@ -75,7 +75,7 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libkea-exceptions.la
kea_lfc_LDADD
+=
$(LOG4CPLUS_LIBS)
$(CRYPTO_LIBS)
kea_lfc_LDFLAGS
=
$(CRYPTO_LDFLAGS)
kea_lfc_LDFLAGS
=
$(AM_LDFLAGS)
$(CRYPTO_LDFLAGS)
if
HAVE_MYSQL
kea_lfc_LDFLAGS
+=
$(MYSQL_LIBS)
endif
...
...
src/lib/dhcpsrv/tests/Makefile.am
View file @
03681966
...
...
@@ -9,6 +9,10 @@ AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
AM_CXXFLAGS
=
$(KEA_CXXFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
endif
# Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time.
# https://svn.boost.org/trac/boost/ticket/3477
...
...
src/lib/exceptions/tests/Makefile.am
View file @
03681966
...
...
@@ -16,7 +16,7 @@ TESTS += run_unittests
run_unittests_SOURCES
=
run_unittests.cc
run_unittests_SOURCES
+=
exceptions_unittest.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(top_builddir)
/src/lib/exceptions/libkea-exceptions.la
run_unittests_LDADD
+=
$(GTEST_LDADD)
...
...
Write
Preview
Supports
Markdown
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