X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=36beb6c4a69579a05403c596c303db464d8182b4;hb=589b85e14b9f10dc6acacfe0a4e17d83c19bba0b;hp=fe6aa458ed08616f5d67f434882ee969573c44f2;hpb=b411e5c35132f61cc1fd99dbeb1ed3f859d6f5ac;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index fe6aa458e..36beb6c4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -50,12 +50,13 @@ EXTRA_DIST = \
 	INSTALL.RHEL \
 	INSTALL.SSL \
 	INSTALL.XenServer \
-	INSTALL.bridge \
 	INSTALL.userspace \
 	IntegrationGuide \
 	NOTICE \
+	OPENFLOW-1.1+ \
 	PORTING \
 	README-gcov \
+	README-lisp \
 	REPORTING-BUGS \
 	SubmittingPatches \
 	WHY-OVS \
@@ -195,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)
@@ -244,3 +258,4 @@ include rhel/automake.mk
 include xenserver/automake.mk
 include python/automake.mk
 include python/compat/automake.mk
+include tutorial/automake.mk