Merge branch 'master' into next

[openvswitch] / vswitchd / automake.mk

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 9121169afec5309e855d0a0cc3604afc4f97a128..c38add65b9ba7b3e88187ae244d7a9eadd11aaaa 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -18,6 +18,7 @@ vswitchd_ovs_vswitchd_SOURCES = \
        vswitchd/xenserver.h
 vswitchd_ovs_vswitchd_LDADD = \
        ofproto/libofproto.a \
+       lib/libsflow.a \
        lib/libopenvswitch.a \
        $(SSL_LIBS)