vswitch: Fix types of NetFlow columns in db schema.

[openvswitch] / vswitchd / automake.mk

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index e7942df7e441303a454da333a18eaf725b4a78f1..f39a032542db85c78853044790bd09d5ff1c05a8 100644 (file)
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -19,15 +19,14 @@ vswitchd_ovs_vswitchd_SOURCES = \
 vswitchd_ovs_vswitchd_LDADD = \
        ofproto/libofproto.a \
        lib/libopenvswitch.a \
-       $(FAULT_LIBS) \
        $(SSL_LIBS)
 
 vswitchd_ovs_brcompatd_SOURCES = \
-       vswitchd/ovs-brcompatd.c
+       vswitchd/ovs-brcompatd.c \
+       vswitchd/vswitch-idl.c \
+       vswitchd/vswitch-idl.h
 
-vswitchd_ovs_brcompatd_LDADD = \
-       lib/libopenvswitch.a \
-       $(FAULT_LIBS) 
+vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 
 EXTRA_DIST += \
        vswitchd/ovs-vswitchd.8.in \
@@ -36,8 +35,15 @@ EXTRA_DIST += \
 EXTRA_DIST += vswitchd/vswitch-idl.ovsidl
 BUILT_SOURCES += vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h
 DISTCLEANFILES += vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h
-noinst_DATA += vswitchd/vswitch-idl.ovsschema
-DISTCLEANFILES += vswitchd/vswitch-idl.ovsschema
-vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h vswitchd/vswitch-idl.ovsschema: \
+noinst_DATA += vswitchd/vswitch-idl.ovsschema vswitchd/vswitch-idl.txt
+DISTCLEANFILES += vswitchd/vswitch-idl.ovsschema vswitchd/vswitch-idl.txt
+vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h \
+vswitchd/vswitch-idl.ovsschema vswitchd/vswitch-idl.txt: \
        ovsdb/ovsdb-idlc.in
-EXTRA_DIST += vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h vswitchd/vswitch-idl.ovsschema
+vswitchd/vswitch-idl.c: vswitchd/vswitch-idl.h
+EXTRA_DIST += \
+       vswitchd/vswitch-idl.c \
+       vswitchd/vswitch-idl.h \
+       vswitchd/vswitch-idl.ovsschema \
+       vswitchd/vswitch-idl.txt
+