There is no value in having two separate libraries for OVN.
Reported-by: Justin Pettit <jpet...@nicira.com>
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
ovn/lib/automake.mk | 3 +--
ovn/northd/automake.mk | 1 -
tests/automake.mk | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ovn/lib/automake.mk b/ovn/lib/automake.mk
index 91a4fe8..d9be997 100644
--- a/ovn/lib/automake.mk
+++ b/ovn/lib/automake.mk
@@ -1,5 +1,4 @@
-lib_LTLIBRARIES += ovn/lib/libovn.la
-ovn_lib_libovn_la_SOURCES = \
+ovn_libovn_la_SOURCES += \
ovn/lib/expr.c \
ovn/lib/expr.h \
ovn/lib/lex.c \
diff --git a/ovn/northd/automake.mk b/ovn/northd/automake.mk
index 6f6c1f5..0364d8b 100644
--- a/ovn/northd/automake.mk
+++ b/ovn/northd/automake.mk
@@ -3,6 +3,5 @@ bin_PROGRAMS += ovn/northd/ovn-northd
ovn_northd_ovn_northd_SOURCES = ovn/northd/ovn-northd.c
ovn_northd_ovn_northd_LDADD = \
ovn/libovn.la \
- ovn/lib/libovn.la \
ovsdb/libovsdb.la \
lib/libopenvswitch.la
diff --git a/tests/automake.mk b/tests/automake.mk
index 4c2817b..9ff0bde 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -292,7 +292,7 @@ tests_ovstest_SOURCES += \
tests/test-unix-socket.c
endif
-tests_ovstest_LDADD = lib/libopenvswitch.la ovn/lib/libovn.la
+tests_ovstest_LDADD = lib/libopenvswitch.la ovn/libovn.la
dist_check_SCRIPTS = tests/flowgen.pl
noinst_PROGRAMS += tests/test-strtok_r
--
2.1.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
