X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fautomake.mk;h=8319c939dabc5e783dadd231c87100623762169a;hb=7c70698f0134fe1dee756e468a095ddd6366a7d5;hp=87963fa94ae903069fc75f7d16eec63f4a282278;hpb=a87c35f1794474ed9d7696bdb762148dc65b0adb;p=sliver-openvswitch.git

diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index 87963fa94..8319c939d 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -9,8 +9,6 @@ DISTCLEANFILES += \
 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 \
@@ -23,9 +21,8 @@ vswitchd_ovs_vswitchd_LDADD = \
 	lib/libsflow.a \
 	lib/libopenvswitch.a \
 	$(SSL_LIBS)
-EXTRA_DIST += \
-	vswitchd/ovs-vswitchd.8.in \
-	vswitchd/INTERNALS
+EXTRA_DIST += vswitchd/INTERNALS
+MAN_ROOTS += vswitchd/ovs-vswitchd.8.in
 
 if HAVE_NETLINK
 sbin_PROGRAMS += vswitchd/ovs-brcompatd
@@ -35,7 +32,7 @@ vswitchd_ovs_brcompatd_SOURCES = \
 	vswitchd/vswitch-idl.h
 vswitchd_ovs_brcompatd_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
 endif
-EXTRA_DIST += vswitchd/ovs-brcompatd.8.in
+MAN_ROOTS += vswitchd/ovs-brcompatd.8.in
 
 # vswitch schema and IDL
 OVSIDL_BUILT += \
@@ -44,6 +41,7 @@ OVSIDL_BUILT += \
 	vswitchd/vswitch-idl.ovsidl
 VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema vswitchd/vswitch-idl.ann
 EXTRA_DIST += $(VSWITCH_IDL_FILES)
+pkgdata_DATA += vswitchd/vswitch.ovsschema
 vswitchd/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
 	$(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
 	mv $@.tmp $@
@@ -83,7 +81,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) \
@@ -102,6 +100,7 @@ vswitchd/vswitch.ovsschema.stamp: vswitchd/vswitch.ovsschema
 	  touch $@; \
 	else \
 	  ln=`sed -n '/"cksum":/=' $?`; \
-	  echo "$?:$$ln: checksum \"$$sum\" does not match (you should probably update the version number and fix the checksum)"; \
+	  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