X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fautomake.mk;h=62ace691c40eae26a28baef97110d62719b07469;hb=5ca1ba484bd9ade5116a49cf241cb98219d7d696;hp=4c3c07622e5c490aac578f96ffe63dfed2815e18;hpb=7c9b00732c633ddd35b9d92fb9fa4c4f8e3ce390;p=sliver-openvswitch.git

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 4c3c07622..62ace691c 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -1,21 +1,14 @@
 sbin_PROGRAMS += vswitchd/ovs-vswitchd
-man_MANS += \
-	vswitchd/ovs-vswitchd.8 \
-	vswitchd/ovs-brcompatd.8
+man_MANS += vswitchd/ovs-vswitchd.8
 DISTCLEANFILES += \
-	vswitchd/ovs-vswitchd.8 \
-	vswitchd/ovs-brcompatd.8
+	vswitchd/ovs-vswitchd.8
 
 vswitchd_ovs_vswitchd_SOURCES = \
 	vswitchd/bridge.c \
 	vswitchd/bridge.h \
-	vswitchd/proc-net-compat.c \
-	vswitchd/proc-net-compat.h \
 	vswitchd/ovs-vswitchd.c \
 	vswitchd/system-stats.c \
 	vswitchd/system-stats.h \
-	vswitchd/vswitch-idl.c \
-	vswitchd/vswitch-idl.h \
 	vswitchd/xenserver.c \
 	vswitchd/xenserver.h
 vswitchd_ovs_vswitchd_LDADD = \
@@ -23,30 +16,12 @@ vswitchd_ovs_vswitchd_LDADD = \
 	lib/libsflow.a \
 	lib/libopenvswitch.a \
 	$(SSL_LIBS)
-EXTRA_DIST += \
-	vswitchd/ovs-vswitchd.8.in \
-	vswitchd/INTERNALS
-
-if HAVE_NETLINK
-sbin_PROGRAMS += vswitchd/ovs-brcompatd
-vswitchd_ovs_brcompatd_SOURCES = \
-	vswitchd/ovs-brcompatd.c \
-	vswitchd/vswitch-idl.c \
-	vswitchd/vswitch-idl.h
-vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-endif
-EXTRA_DIST += vswitchd/ovs-brcompatd.8.in
+EXTRA_DIST += vswitchd/INTERNALS
+MAN_ROOTS += vswitchd/ovs-vswitchd.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
-EXTRA_DIST += $(VSWITCH_IDL_FILES)
-vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
-	$(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
-	mv $@.tmp $@
+EXTRA_DIST += vswitchd/vswitch.ovsschema
+pkgdata_DATA += vswitchd/vswitch.ovsschema
 
 # vswitch E-R diagram
 #
@@ -83,7 +58,7 @@ EXTRA_DIST += vswitchd/vswitch.gv vswitchd/vswitch.pic
 # vswitch schema documentation
 EXTRA_DIST += vswitchd/vswitch.xml
 dist_man_MANS += vswitchd/ovs-vswitchd.conf.db.5
-vswitchd/ovs-vswitchd.conf.db.5: \
+$(srcdir)/vswitchd/ovs-vswitchd.conf.db.5: \
 	ovsdb/ovsdb-doc.in vswitchd/vswitch.xml vswitchd/vswitch.ovsschema \
 	$(srcdir)/vswitchd/vswitch.pic
 	$(OVSDB_DOC) \
@@ -92,3 +67,21 @@ vswitchd/ovs-vswitchd.conf.db.5: \
 		$(srcdir)/vswitchd/vswitch.ovsschema \
 		$(srcdir)/vswitchd/vswitch.xml > $@.tmp
 	mv $@.tmp $@
+
+# Version checking for vswitch.ovsschema.
+ALL_LOCAL += vswitchd/vswitch.ovsschema.stamp
+vswitchd/vswitch.ovsschema.stamp: vswitchd/vswitch.ovsschema
+	@sum=`sed '/cksum/d' $? | cksum`; \
+	expected=`sed -n 's/.*"cksum": "\(.*\)".*/\1/p' $?`; \
+	if test "X$$sum" = "X$$expected"; then \
+	  touch $@; \
+	else \
+	  ln=`sed -n '/"cksum":/=' $?`; \
+	  echo >&2 "$?:$$ln: checksum \"$$sum\" does not match (you should probably update the version number and fix the checksum)"; \
+	  exit 1; \
+	fi
+CLEANFILES += vswitchd/vswitch.ovsschema.stamp
+
+# Clean up generated files from older OVS versions.  (This is important so that
+# #include "vswitch-idl.h" doesn't get the wrong copy.)
+CLEANFILES += vswitchd/vswitch-idl.c vswitchd/vswitch-idl.h