acinclude: Include libmnl when needed

[ovs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c82a9e21ec36398c8313e2f73b9bd8934e728b65..8408509c9a83f75d2b16663c9e0d862fea7b2507 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,9 +72,11 @@ PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
        AUTHORS.rst \
        CONTRIBUTING.rst \
+       LICENSE \
        MAINTAINERS.rst \
        README.rst \
        NOTICE \
+       .cirrus.yml \
        .travis.yml \
        .travis/linux-build.sh \
        .travis/linux-prepare.sh \
@@ -82,14 +84,10 @@ EXTRA_DIST = \
        .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/dpdkstrip.py \
-       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 \
@@ -105,6 +103,7 @@ dist_pkgdata_SCRIPTS =
 dist_sbin_SCRIPTS =
 dist_scripts_SCRIPTS =
 dist_scripts_DATA =
+EXTRA_PROGRAMS =
 INSTALL_DATA_LOCAL =
 UNINSTALL_LOCAL =
 man_MANS =
@@ -129,6 +128,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
@@ -144,13 +147,12 @@ 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 $(PYTHON) $(srcdir)/build-aux/soexpand.py -I$(srcdir) < $< | \
          $(PYTHON) $(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,[@]RUNDIR[@],$(RUNDIR),g' \
            -e 's,[@]VERSION[@],$(VERSION),g' \
@@ -175,7 +177,6 @@ SUFFIXES += .xml
          PKIDIR='$(PKIDIR)' \
          LOGDIR='$(LOGDIR)' \
          DBDIR='$(DBDIR)' \
-         PERL='$(PERL)' \
          PYTHON='$(PYTHON)' \
          RUNDIR='$(RUNDIR)' \
          VERSION='$(VERSION)' \
@@ -200,6 +201,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 \
@@ -296,7 +298,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."; \
@@ -315,6 +317,21 @@ check-echo-n:
        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-whitelist` /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); \
@@ -361,7 +378,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
@@ -373,6 +390,7 @@ 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
 # F*** -- warnings native to flake8
 #   F811 redefinition of unused <name> from line <N> (only from flake8 v2.0)
@@ -383,7 +401,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,W503,F811,D,H,I
+FLAKE8_IGNORE = E121,E123,E125,E126,E127,E128,E129,E131,E722,W503,F811,D,H,I
 flake8-check: $(FLAKE8_PYFILES)
        $(FLAKE8_WERROR)$(AM_V_GEN) \
          src='$^' && \
@@ -394,8 +412,8 @@ 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
+$(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
        @if cmp -s $(@F).tmp $@; then \
          touch $@; \
          rm -f $(@F).tmp; \
@@ -406,14 +424,30 @@ 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 //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)"
-       MSBuild.exe //nologo //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 //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)"
-       MSBuild.exe //nologo //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
 
@@ -449,6 +483,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