acinclude: Strip out -mno-avx512f provided by DPDK.

[ovs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ff472ad81baab00fdeeafd34a264f27cad20a391..691a005ad9776fbaf902fbebf45e8188cce0c302 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ AM_CPPFLAGS += -DNDEBUG
 AM_CFLAGS += -fomit-frame-pointer
 endif
 
-AM_CTAGSFLAGS = $(OVS_CTAGS_IDENTIFIERS_LIST)
+AM_CTAGSFLAGS = -I "$(OVS_CTAGS_IDENTIFIERS_LIST)"
 
 if WIN32
 psep=";"
@@ -60,7 +60,7 @@ endif
 # foo/__init__.pyc will cause Python to ignore foo.py.
 run_python = \
        PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \
-       PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
+       PYTHONDONTWRITEBYTECODE=yes $(PYTHON3)
 
 ALL_LOCAL =
 BUILT_SOURCES =
@@ -76,11 +76,13 @@ EXTRA_DIST = \
        MAINTAINERS.rst \
        README.rst \
        NOTICE \
+       .ci/linux-build.sh \
+       .ci/linux-prepare.sh \
+       .ci/osx-build.sh \
+       .ci/osx-prepare.sh \
+       .cirrus.yml \
+       .github/workflows/build-and-test.yml \
        .travis.yml \
-       .travis/linux-build.sh \
-       .travis/linux-prepare.sh \
-       .travis/osx-build.sh \
-       .travis/osx-prepare.sh \
        appveyor.yml \
        boot.sh \
        poc/builders/Vagrantfile \
@@ -146,13 +148,13 @@ ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-
 
 SUFFIXES += .in
 .in:
-       $(AM_V_GEN)PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON) $(srcdir)/build-aux/soexpand.py -I$(srcdir) < $< | \
-         $(PYTHON) $(srcdir)/build-aux/dpdkstrip.py $(DPDKSTRIP_FLAGS) | \
+       $(AM_V_GEN)PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/soexpand.py -I$(srcdir) < $< | \
+         $(PYTHON3) $(srcdir)/build-aux/dpdkstrip.py $(DPDKSTRIP_FLAGS) | \
          sed \
            -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
            -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
            -e 's,[@]DBDIR[@],$(DBDIR),g' \
-           -e 's,[@]PYTHON[@],$(PYTHON),g' \
+           -e 's,[@]PYTHON3[@],$(PYTHON3),g' \
            -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
            -e 's,[@]VERSION[@],$(VERSION),g' \
            -e 's,[@]localstatedir[@],$(localstatedir),g' \
@@ -176,7 +178,7 @@ SUFFIXES += .xml
          PKIDIR='$(PKIDIR)' \
          LOGDIR='$(LOGDIR)' \
          DBDIR='$(DBDIR)' \
-         PYTHON='$(PYTHON)' \
+         PYTHON3='$(PYTHON3)' \
          RUNDIR='$(RUNDIR)' \
          VERSION='$(VERSION)' \
          localstatedir='$(localstatedir)' \
@@ -275,7 +277,7 @@ static-check:
        fi
 .PHONY: static-check
 
-# Check that assert.h is not used outside a whitelist of files.
+# Check that assert.h is not used (outside a small set of files).
 ALL_LOCAL += check-assert-h-usage
 check-assert-h-usage:
        @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
@@ -322,7 +324,7 @@ check-tabs:
        if test -e .git && (git --version) >/dev/null 2>&1 && \
          grep -ln "^   " \
            `git ls-files \
-             | grep -v -f build-aux/initial-tab-whitelist` /dev/null \
+             | grep -v -f build-aux/initial-tab-allowed-files` /dev/null \
              | $(EGREP) -v ':[         ]*/?\*'; \
        then \
          echo "See above for files that use tabs for indentation."; \
@@ -335,16 +337,16 @@ ALL_LOCAL += thread-safety-check
 thread-safety-check:
        @cd $(srcdir); \
        if test -e .git && (git --version) >/dev/null 2>&1 && \
-         grep -n -f build-aux/thread-safety-blacklist \
+         grep -n -f build-aux/thread-safety-forbidden \
            `git ls-files | grep '\.[ch]$$' \
              | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \
              | $(EGREP) -v ':[         ]*/?\*'; \
        then \
          echo "See above for list of calls to functions that are"; \
-         echo "blacklisted due to thread safety issues"; \
+         echo "forbidden due to thread safety issues"; \
          exit 1; \
        fi
-EXTRA_DIST += build-aux/thread-safety-blacklist
+EXTRA_DIST += build-aux/thread-safety-forbidden
 .PHONY: thread-safety-check
 
 # Check that "ip" is used in preference to "ifconfig", because
@@ -391,6 +393,7 @@ ALL_LOCAL += flake8-check
 #   E131 continuation line unaligned for hanging indent
 #   E722 do not use bare except, specify exception instead
 #   W503 line break before binary operator
+#   W504 line break after binary operator
 # F*** -- warnings native to flake8
 #   F811 redefinition of unused <name> from line <N> (only from flake8 v2.0)
 # D*** -- warnings from flake8-docstrings plugin
@@ -400,7 +403,7 @@ ALL_LOCAL += flake8-check
 #   H233 Python 3.x incompatible use of print operator
 #   H238 old style class declaration, use new style (inherit from `object`)
 FLAKE8_SELECT = H231,H232,H233,H238
-FLAKE8_IGNORE = E121,E123,E125,E126,E127,E128,E129,E131,E722,W503,F811,D,H,I
+FLAKE8_IGNORE = E121,E123,E125,E126,E127,E128,E129,E131,E722,W503,W504,F811,D,H,I
 flake8-check: $(FLAKE8_PYFILES)
        $(FLAKE8_WERROR)$(AM_V_GEN) \
          src='$^' && \
@@ -410,15 +413,16 @@ flake8-check: $(FLAKE8_PYFILES)
 endif
 CLEANFILES += flake8-check
 
-include $(srcdir)/manpages.mk
-$(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py python/build/soutil.py
-       @PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
+-include manpages.mk
+manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py python/build/soutil.py
+       @PYTHONPATH=$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp
        @if cmp -s $(@F).tmp $@; then \
          touch $@; \
          rm -f $(@F).tmp; \
        else \
          mv $(@F).tmp $@; \
        fi
+CLEANFILES += manpages.mk
 CLEANFILES += manpage-dep-check
 
 if VSTUDIO_DDK
@@ -482,6 +486,7 @@ include tests/automake.mk
 include include/automake.mk
 include third-party/automake.mk
 include debian/automake.mk
+include ipsec/automake.mk
 include vswitchd/automake.mk
 include ovsdb/automake.mk
 include rhel/automake.mk
@@ -492,6 +497,5 @@ include vtep/automake.mk
 include datapath-windows/automake.mk
 include datapath-windows/include/automake.mk
 include windows/automake.mk
-include ovn/automake.mk
 include selinux/automake.mk
 include build-aux/automake.mk