Skip to content
GitLab
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
0f07b7c1
Commit
0f07b7c1
authored
May 11, 2011
by
Stephen Morris
Browse files
[trac542] Alterations to makefiles to take out unnecessary dependencies
parent
a28db69a
Changes
17
Hide whitespace changes
Inline
Side-by-side
src/bin/auth/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -53,8 +53,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/server_common/libserver_common.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/nsas/libnsas.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
endif
noinst_PROGRAMS
=
$(TESTS)
src/bin/resolver/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -43,8 +43,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/nsas/libnsas.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/resolve/libresolve.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
# Note the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS
...
...
src/bin/sockcreator/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -16,10 +16,8 @@ run_unittests_SOURCES += run_unittests.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
\
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
endif
noinst_PROGRAMS
=
$(TESTS)
src/lib/asiolink/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -32,9 +32,6 @@ run_unittests_LDADD += $(SQLITE_LIBS)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
...
...
src/lib/bench/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -17,9 +17,6 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(top_builddir)
/src/lib/bench/libbench.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
run_unittests_LDADD
+=
$(GTEST_LDADD)
endif
...
...
src/lib/cache/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -55,11 +55,8 @@ endif
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cache/libcache.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/nsas/libnsas.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/
exceptions/libexception
s.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/
util/unittests/libutil_unittest
s.la
endif
noinst_PROGRAMS
=
$(TESTS)
...
...
src/lib/cc/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -27,8 +27,6 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
endif
...
...
src/lib/config/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -23,12 +23,9 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
run_unittests_LDADD
+=
libfake_session.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/config/libcfgclient.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
endif
...
...
src/lib/cryptolink/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -20,9 +20,6 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libcryptolink.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
endif
noinst_PROGRAMS
=
$(TESTS)
src/lib/datasrc/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -36,9 +36,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
endif
noinst_PROGRAMS
=
$(TESTS)
...
...
src/lib/dns/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -56,10 +56,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
endif
noinst_PROGRAMS
=
$(TESTS)
src/lib/log/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -30,8 +30,6 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
endif
TESTS
+=
logger_support_test
...
...
src/lib/nsas/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -55,9 +55,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
endif
noinst_PROGRAMS
=
$(TESTS)
src/lib/resolve/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -31,9 +31,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
endif
...
...
src/lib/server_common/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -38,9 +38,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
endif
noinst_PROGRAMS
=
$(TESTS)
src/lib/util/unittests/Makefile.am
View file @
0f07b7c1
...
...
@@ -8,7 +8,6 @@ libutil_unittests_la_SOURCES += run_all.h run_all.cc
libutil_unittests_la_SOURCES
+=
testdata.h testdata.cc
libutil_unittests_la_SOURCES
+=
textdata.h
libutil_unittests_la_LIBADD
=
$(top_builddir)
/src/lib/util/io/libutil_io.la
libutil_unittests_la_LIBADD
=
$(top_builddir)
/src/lib/util/libutil.la
libutil_unittests_la_LIBADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
...
...
tests/tools/badpacket/tests/Makefile.am
View file @
0f07b7c1
...
...
@@ -23,11 +23,7 @@ run_unittests_SOURCES += $(top_builddir)/tests/tools/badpacket/option_info.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/log/liblog.la
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/util/io/libutil_io.la
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/util/libutil.la
run_unittests_LDADD
=
$(GTEST_LDADD)
endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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