]> git.proxmox.com Git - ovs.git/blobdiff - Makefile.am
acinclude: Strip out -mno-avx512f provided by DPDK.
[ovs.git] / Makefile.am
index 4a6b5e5747faee8318b9fa75a5602a42b37bb7fd..691a005ad9776fbaf902fbebf45e8188cce0c302 100644 (file)
@@ -20,6 +20,7 @@ AM_CPPFLAGS += $(PTHREAD_INCLUDES)
 AM_CPPFLAGS += $(MSVC_CFLAGS)
 AM_LDFLAGS += $(PTHREAD_LDFLAGS)
 AM_LDFLAGS += $(MSVC64_LDFLAGS)
+PLATFORM = $(MSVC_PLATFORM)
 endif
 
 AM_CPPFLAGS += -I $(top_srcdir)/include
@@ -35,6 +36,9 @@ AM_CFLAGS += $(OVS_CFLAGS)
 
 if DPDK_NETDEV
 AM_CFLAGS += -D_FILE_OFFSET_BITS=64
+DPDKSTRIP_FLAGS = --dpdk
+else
+DPDKSTRIP_FLAGS = --nodpdk
 endif
 
 if NDEBUG
@@ -42,6 +46,8 @@ AM_CPPFLAGS += -DNDEBUG
 AM_CFLAGS += -fomit-frame-pointer
 endif
 
+AM_CTAGSFLAGS = -I "$(OVS_CTAGS_IDENTIFIERS_LIST)"
+
 if WIN32
 psep=";"
 else
@@ -54,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 =
@@ -66,23 +72,23 @@ PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
        AUTHORS.rst \
        CONTRIBUTING.rst \
+       LICENSE \
        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 \
-       build-aux/cccl \
-       build-aux/cksum-schema-check \
-       build-aux/calculate-schema-cksum \
-       build-aux/dist-docs \
-       build-aux/sodepends.pl \
-       build-aux/soexpand.pl \
-       build-aux/xml2nroff \
+       poc/builders/Vagrantfile \
+       poc/playbook-centos-builder.yml \
+       poc/playbook-fedora-builder.yml \
+       poc/playbook-ubuntu-builder.yml \
        $(MAN_FRAGMENTS) \
        $(MAN_ROOTS) \
        Vagrantfile \
@@ -98,6 +104,7 @@ dist_pkgdata_SCRIPTS =
 dist_sbin_SCRIPTS =
 dist_scripts_SCRIPTS =
 dist_scripts_DATA =
+EXTRA_PROGRAMS =
 INSTALL_DATA_LOCAL =
 UNINSTALL_LOCAL =
 man_MANS =
@@ -106,6 +113,7 @@ MAN_ROOTS =
 noinst_DATA =
 noinst_HEADERS =
 lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 noinst_man_MANS =
 noinst_PROGRAMS =
 noinst_SCRIPTS =
@@ -121,6 +129,10 @@ check_SCRIPTS =
 pkgconfig_DATA =
 FLAKE8_PYFILES =
 
+if ENABLE_SPARSE_BY_DEFAULT
+C ?= 1
+endif
+
 scriptsdir = $(pkgdatadir)/scripts
 completiondir = $(sysconfdir)/bash_completion.d
 pkgconfigdir = $(libdir)/pkgconfig
@@ -136,13 +148,13 @@ ro_shell = printf '\043 Generated automatically -- do not modify!    -*- buffer-
 
 SUFFIXES += .in
 .in:
-       $(AM_V_GEN)$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
+       $(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,[@]PERL[@],$(PERL),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' \
@@ -166,8 +178,7 @@ SUFFIXES += .xml
          PKIDIR='$(PKIDIR)' \
          LOGDIR='$(LOGDIR)' \
          DBDIR='$(DBDIR)' \
-         PERL='$(PERL)' \
-         PYTHON='$(PYTHON)' \
+         PYTHON3='$(PYTHON3)' \
          RUNDIR='$(RUNDIR)' \
          VERSION='$(VERSION)' \
          localstatedir='$(localstatedir)' \
@@ -191,6 +202,7 @@ dist-hook-git: distfiles
          (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \
            LC_ALL=C sort -u > all-distfiles; \
          (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \
+           grep -v '\.gitattributes$$' | \
            LC_ALL=C sort -u > all-gitfiles; \
          LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
          if test -s missing-distfiles; then \
@@ -265,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 && \
@@ -287,7 +299,7 @@ check-endian:
        @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
          (cd $(srcdir) && git --no-pager grep -l -E \
           -e 'BIG_ENDIAN|LITTLE_ENDIAN' --and --not -e 'BYTE_ORDER' | \
-         $(EGREP) -v '^datapath/'); \
+         $(EGREP) -v '^datapath/|^include/sparse/rte_'); \
        then \
          echo "See above for list of files that misuse LITTLE""_ENDIAN"; \
          echo "or BIG""_ENDIAN.  Please use WORDS_BIGENDIAN instead."; \
@@ -295,22 +307,62 @@ check-endian:
        fi
 .PHONY: check-endian
 
+ALL_LOCAL += check-echo-n
+check-echo-n:
+       @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
+         git --no-pager grep -n 'echo'' -n' $(srcdir); \
+       then \
+         echo "See above for uses for \"echo"" -n\", which is non-POSIX"; \
+         echo "and does not work with all shells.  Use \"printf\" instead."; \
+         exit 1; \
+       fi
+.PHONY: check-echo-n
+
+ALL_LOCAL += check-tabs
+check-tabs:
+       @cd $(srcdir); \
+       if test -e .git && (git --version) >/dev/null 2>&1 && \
+         grep -ln "^   " \
+           `git ls-files \
+             | grep -v -f build-aux/initial-tab-allowed-files` /dev/null \
+             | $(EGREP) -v ':[         ]*/?\*'; \
+       then \
+         echo "See above for files that use tabs for indentation."; \
+         echo "Please use spaces instead."; \
+         exit 1; \
+       fi
+.PHONY: check-tabs
+
 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
+# "ifconfig" is not installed ubiquitously anymore.
+ALL_LOCAL += check-ifconfig
+check-ifconfig:
+       @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
+         (cd $(srcdir) && git --no-pager grep -l -E -e 'ifconfig' | \
+           $(EGREP) -v 'Makefile.am|ovs-vsctl-bashcomp|openvswitch-custom\.te'); \
+       then \
+         echo "See above for list of files that use or reference"; \
+          echo "'ifconfig'.  Please use 'ip' instead."; \
+         exit 1; \
+       fi
+.PHONY: check-ifconfig
+
 if HAVE_GROFF
 ALL_LOCAL += manpage-check
 manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
@@ -327,7 +379,7 @@ endif
 
 if HAVE_FLAKE8
 ALL_LOCAL += flake8-check
-# http://flake8.readthedocs.org/en/latest/warnings.html
+# http://flake8.readthedocs.org/en/latest/user/error-codes.html
 # All warnings explicitly selected or ignored should be listed below.
 #
 # E***, W*** -- warnings from pep8
@@ -339,7 +391,9 @@ ALL_LOCAL += flake8-check
 #   E128 continuation line under-indented for visual indent
 #   E129 visually indented line with same indent as next logical line
 #   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
@@ -349,9 +403,9 @@ 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,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)
-       $(AM_V_GEN) \
+       $(FLAKE8_WERROR)$(AM_V_GEN) \
          src='$^' && \
          flake8 $$src --select=$(FLAKE8_SELECT) $(FLAKE8_FLAGS) && \
          flake8 $$src --ignore=$(FLAKE8_IGNORE) $(FLAKE8_FLAGS) && \
@@ -359,27 +413,44 @@ flake8-check: $(FLAKE8_PYFILES)
 endif
 CLEANFILES += flake8-check
 
-include $(srcdir)/manpages.mk
-$(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.pl
-       @$(PERL) $(srcdir)/build-aux/sodepends.pl -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
 ALL_LOCAL += ovsext
+ARCH = x64
 ovsext: datapath-windows/ovsext.sln $(srcdir)/datapath-windows/include/OvsDpInterface.h
-       MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)"
-       MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)"
+if VSTUDIO_WIN8
+       MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
+endif
+if VSTUDIO_WIN8_1
+       MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
+endif
+if VSTUDIO_WIN10
+       MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
+endif
+
 
 CLEAN_LOCAL += ovsext_clean
 ovsext_clean: datapath-windows/ovsext.sln
-       MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)"
-       MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)"
+if VSTUDIO_WIN8
+       MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
+endif
+if VSTUDIO_WIN8_1
+       MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
+endif
+if VSTUDIO_WIN10
+       MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win10$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
+endif
 endif
 .PHONY: ovsext
 
@@ -415,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
@@ -425,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