dpif-netlink: add GENEVE creation support

[cascardo/ovs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0b2aa12..8cb8523 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,11 +79,13 @@ docs = \
        INSTALL.Libvirt.md \
        INSTALL.NetBSD.md \
        INSTALL.RHEL.md \
+       INSTALL.SELinux.md \
        INSTALL.SSL.md \
        INSTALL.XenServer.md \
        INSTALL.userspace.md \
        INSTALL.Windows.md \
        IntegrationGuide.md \
+       MAINTAINERS.md \
        OPENFLOW-1.1+.md \
        PORTING.md \
        README.md \
@@ -97,12 +99,15 @@ EXTRA_DIST = \
        $(docs) \
        NOTICE \
        .travis.yml \
-       .travis/build.sh \
-       .travis/prepare.sh \
+       .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 \
@@ -246,7 +251,7 @@ config-h-check:
        @cd $(srcdir); \
        if test -e .git && (git --version) >/dev/null 2>&1 && \
           git --no-pager grep -L '#include <config\.h>' `git ls-files | grep '\.c$$' | \
-               grep -vE '^datapath|^lib/sflow|^third-party|^datapath-windows'`; \
+               grep -vE '^datapath|^lib/sflow|^third-party|^datapath-windows|^python'`; \
        then \
            echo "See above for list of violations of the rule that"; \
            echo "every C source file must #include <config.h>."; \
@@ -365,8 +370,11 @@ 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-check: $(FLAKE8_PYFILES)
-       $(AM_V_GEN) if flake8 $^ --select=H231,H232,H233,H238 --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi
+       $(AM_V_GEN) if flake8 $^ --select=H231,H232,H233,H238 ${FLAKE8_FLAGS} && \
+               flake8 $^ --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then \
+               touch $@; else exit 1; fi
 endif
+CLEANFILES += flake8-check
 
 include $(srcdir)/manpages.mk
 $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.pl
@@ -380,17 +388,17 @@ $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.pl
 CLEANFILES += manpage-dep-check
 
 if VSTUDIO_DDK
-ALL_LOCAL += ovsext_make
-ovsext_make: datapath-windows/ovsext.sln
-       MSBuild.exe datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)"
-       MSBuild.exe datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)"
+ALL_LOCAL += ovsext
+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)"
+       MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)"
 
 CLEAN_LOCAL += ovsext_clean
 ovsext_clean: datapath-windows/ovsext.sln
-       MSBuild.exe datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)"
-       MSBuild.exe datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)"
+       MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)"
+       MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)"
 endif
-.PHONY: ovsext_make
+.PHONY: ovsext
 
 dist-hook: $(DIST_HOOKS)
 all-local: $(ALL_LOCAL)
@@ -405,7 +413,7 @@ if LINUX_ENABLED
 endif
 
 dist-docs:
-       VERSION=$(VERSION) $(srcdir)/build-aux/dist-docs $(srcdir) $(docs)
+       VERSION=$(VERSION) MAKE='$(MAKE)' $(srcdir)/build-aux/dist-docs $(srcdir) $(docs)
 .PHONY: dist-docs
 
 include Documentation/automake.mk
@@ -428,3 +436,4 @@ include datapath-windows/automake.mk
 include datapath-windows/include/automake.mk
 include windows/automake.mk
 include ovn/automake.mk
+include selinux/automake.mk