Merge "master" into "wdp".

[sliver-openvswitch.git] / lib / automake.mk

diff --git a/lib/automake.mk b/lib/automake.mk
index 27a8c18..a6c9f61 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -58,6 +58,7 @@ lib_libopenvswitch_a_SOURCES = \
        lib/lockfile.h \
        lib/mac-learning.c \
        lib/mac-learning.h \
+       lib/netdev-gre.c \
        lib/netdev-linux.c \
        lib/netdev-provider.h \
        lib/netdev.c \
@@ -205,6 +206,8 @@ EXTRA_DIST += \
        lib/ssl-peer-ca-cert.man \
        lib/ssl-syn.man \
        lib/ssl.man \
+       lib/unixctl.man \
+       lib/unixctl-syn.man \
        lib/vconn-active.man \
        lib/vconn-passive.man \
        lib/vlog-syn.man \
@@ -212,7 +215,6 @@ EXTRA_DIST += \
        lib/vlog.man \
        lib/xfif.man
 
-
 lib/dirs.c: Makefile
        ($(ro_c) && \
         echo 'const char ovs_pkgdatadir[] = "$(pkgdatadir)";' && \