X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fautomake.mk;h=d5f9056f50daf289c0e3ba37ea533422a582fa0e;hb=c69ee87c10818267f991236201150b1fa51ae519;hp=8e27fc2fed9a626726d17774aeb8a5de66350796;hpb=3f355f47f8e7343e909ccfa854454d667baf3c38;p=sliver-openvswitch.git

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 8e27fc2fe..d5f9056f5 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -1,38 +1,48 @@
 sbin_PROGRAMS += vswitchd/ovs-vswitchd vswitchd/ovs-brcompatd
 man_MANS += \
-	vswitchd/ovs-vswitchd.conf.5 \
 	vswitchd/ovs-vswitchd.8 \
 	vswitchd/ovs-brcompatd.8
 DISTCLEANFILES += \
-	vswitchd/ovs-vswitchd.conf.5 \
 	vswitchd/ovs-vswitchd.8 \
 	vswitchd/ovs-brcompatd.8
 
 vswitchd_ovs_vswitchd_SOURCES = \
 	vswitchd/bridge.c \
 	vswitchd/bridge.h \
-	vswitchd/mgmt.c \
-	vswitchd/mgmt.h \
 	vswitchd/proc-net-compat.c \
 	vswitchd/proc-net-compat.h \
 	vswitchd/ovs-vswitchd.c \
-	vswitchd/ovs-vswitchd.h \
+	vswitchd/vswitch-idl.c \
+	vswitchd/vswitch-idl.h \
 	vswitchd/xenserver.c \
 	vswitchd/xenserver.h
 vswitchd_ovs_vswitchd_LDADD = \
 	ofproto/libofproto.a \
+	lib/libsflow.a \
 	lib/libopenvswitch.a \
-	$(FAULT_LIBS) \
-	$(SSL_LIBS)
+	$(SSL_LIBS) \
+	$(PCRE_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) $(PCRE_LIBS)
 
 EXTRA_DIST += \
-	vswitchd/ovs-vswitchd.conf.5.in \
 	vswitchd/ovs-vswitchd.8.in \
 	vswitchd/ovs-brcompatd.8.in
+
+
+# vswitch schema and IDL
+OVSIDL_BUILT += \
+	vswitchd/vswitch-idl.c \
+	vswitchd/vswitch-idl.h \
+	vswitchd/vswitch-idl.ovsidl
+VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema vswitchd/vswitch-idl.ann
+noinst_DATA += vswitchd/vswitch-idl.txt
+EXTRA_DIST += $(VSWITCH_IDL_FILES) vswitchd/vswitch-idl.txt
+vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
+	$(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
+	mv $@.tmp $@