Merge branch 'mainstream'

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 488aed2..d8cc733 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,10 +27,13 @@ endif
 # vSwitch, but it causes trouble if you switch from a version with
 # foo/__init__.py into an (older) version with plain foo.py, since
 # foo/__init__.pyc will cause Python to ignore foo.py.
-run_python = \
-       PYTHONDONTWRITEBYTECODE=yes \
-       PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH \
-       $(PYTHON)
+if INCLUDE_PYTHON_COMPAT
+run_python = PYTHONPATH=$(top_srcdir)/python:$(top_srcdir)/python/compat:$$PYTHONPATH
+else
+run_python = PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH
+endif
+run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
+
 
 ALL_LOCAL =
 BUILT_SOURCES =
@@ -108,6 +111,7 @@ ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-
 
 SUFFIXES += .in
 .in:
+       @mkdir -p $$(dirname $@)
        $(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
            sed \
                -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
@@ -149,7 +153,7 @@ dist-hook-git: distfiles
          (cd datapath && $(MAKE) distfiles);                               \
          (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) |        \
            sort -u > all-distfiles;                                        \
-         (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |        \
+         (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles |     \
            sort -u > all-gitfiles;                                         \
          comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;        \
          if test -s missing-distfiles; then                                \
@@ -202,7 +206,7 @@ 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/'; \
+           $(EGREP) -v '^lib/(sflow_receiver|vlog).c$$|^tests/'; \
          then \
            echo "Files listed above unexpectedly #include <""assert.h"">."; \
            echo "Please use ovs_assert (from util.h) instead of assert."; \
@@ -210,6 +214,20 @@ check-assert-h-usage:
         fi
 .PHONY: check-assert-h-usage
 
+ALL_LOCAL += thread-safety-check
+thread-safety-check:
+       @if test -e '$(srcdir)'/.git && (git --version) >/dev/null 2>&1 && \
+          grep -n -f '$(srcdir)'/build-aux/thread-safety-blacklist \
+              `git ls-files '$(srcdir)' | grep '\.[ch]$$' \
+                | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` \
+              | $(EGREP) -v ':[        ]*/?\*'; \
+       then \
+           echo "See above for list of calls to functions that are"; \
+           echo "blacklisted due to thread safety issues"; \
+           exit 1; \
+       fi
+EXTRA_DIST += build-aux/thread-safety-blacklist
+
 if HAVE_GROFF
 ALL_LOCAL += manpage-check
 manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
@@ -259,4 +277,6 @@ include rhel/automake.mk
 include xenserver/automake.mk
 include python/automake.mk
 include python/compat/automake.mk
+include planetlab/automake.mk
 include tutorial/automake.mk
+include vtep/automake.mk