Merge branch 'master' into next

[openvswitch] / utilities / automake.mk

diff --git a/utilities/automake.mk b/utilities/automake.mk
index b3d784188b7bc9c6fbae21bc95dda3489680afc7..5feb01cda9d37d7769cee393dc793643b0e23986 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -72,6 +72,7 @@ utilities_ovs_ofctl_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 utilities_ovs_openflowd_SOURCES = utilities/ovs-openflowd.c
 utilities_ovs_openflowd_LDADD = \
        ofproto/libofproto.a \
+       lib/libsflow.a \
        lib/libopenvswitch.a \
        $(SSL_LIBS)