X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=bd5e2fc10ce3a3d07185e732c6c7bbbba1d50f74;hb=305b76debf72120672a8ba81d3356b6dccb1da9a;hp=4da1baba6774802ae963f07a6507074de52042ad;hpb=7a97619ae4484604c15b846ce7268094e048729a;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 4da1baba6..bd5e2fc10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,16 +43,17 @@ EXTRA_DIST = \
 	DESIGN \
 	FAQ \
 	INSTALL \
+	INSTALL.Debian \
 	INSTALL.Fedora \
 	INSTALL.KVM \
 	INSTALL.Libvirt \
 	INSTALL.RHEL \
 	INSTALL.SSL \
 	INSTALL.XenServer \
-	INSTALL.bridge \
 	INSTALL.userspace \
 	IntegrationGuide \
 	NOTICE \
+	OPENFLOW-1.1+ \
 	PORTING \
 	README-gcov \
 	REPORTING-BUGS \
@@ -169,6 +170,20 @@ CLEANFILES += distfiles
 endif
 .PHONY: dist-hook-git
 
+# Check that every .c file includes <config.h>.
+ALL_LOCAL += config-h-check
+config-h-check:
+	@cd $(srcdir); \
+	if test -e .git && (git --version) >/dev/null 2>&1 && \
+	   git --no-pager grep -L '#include <config\.h>' `git ls-files | grep '\.c$$' | \
+               grep -vE '^datapath|^lib/sflow|^third-party'`; \
+	then \
+	    echo "See above for list of violations of the rule that"; \
+	    echo "every C source file must #include <config.h>."; \
+	    exit 1; \
+	fi
+.PHONY: config-h-check
+
 # Check that "struct vlog_ratelimit" is always declared "static".
 ALL_LOCAL += rate-limit-check
 rate-limit-check:
@@ -181,6 +196,19 @@ rate-limit-check:
 	 fi
 .PHONY: rate-limit-check
 
+# Check that assert.h is not used outside a whitelist of files.
+ALL_LOCAL += check-assert-h-usage
+check-assert-h-usage:
+	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
+	    (cd $(srcdir) && git --no-pager grep -l -E '[<]assert.h[>]') | \
+	    $(EGREP) -v '^lib/(sflow_receiver|vlog|worker).c$$|^tests/'; \
+         then \
+	    echo "Files listed above unexpectedly #include <""assert.h"">."; \
+	    echo "Please use ovs_assert (from util.h) instead of assert."; \
+	    exit 1; \
+	 fi
+.PHONY: check-assert-h-usage
+
 if HAVE_GROFF
 ALL_LOCAL += manpage-check
 manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
@@ -212,6 +240,11 @@ install-data-local: $(INSTALL_DATA_LOCAL)
 uninstall-local: $(UNINSTALL_LOCAL)
 .PHONY: $(DIST_HOOKS) $(CLEAN_LOCAL) $(INSTALL_DATA_LOCAL) $(UNINSTALL_LOCAL)
 
+modules_install:
+if LINUX_ENABLED
+	cd datapath/linux && $(MAKE) modules_install
+endif
+
 include lib/automake.mk
 include ofproto/automake.mk
 include utilities/automake.mk