X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fautomake.mk;h=d5f9056f50daf289c0e3ba37ea533422a582fa0e;hb=abaad8cf1b5089e17a4af0ab1ff644bfcf63cad9;hp=29e4034d270db9038d396c79d0205641325f8bfb;hpb=45a7de56bbcb2adfabf2082b1133e768777d44d6;p=openvswitch

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 29e4034d..d5f9056f 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -18,35 +18,31 @@ vswitchd_ovs_vswitchd_SOURCES = \
 	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/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.8.in \
 	vswitchd/ovs-brcompatd.8.in
 
-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 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
-vswitchd/vswitch-idl.c: vswitchd/vswitch-idl.h
-EXTRA_DIST += \
+
+# vswitch schema and IDL
+OVSIDL_BUILT += \
 	vswitchd/vswitch-idl.c \
 	vswitchd/vswitch-idl.h \
-	vswitchd/vswitch-idl.ovsschema \
-	vswitchd/vswitch-idl.txt
-
+	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 $@