netdev: do not allow devices to be opened with conflicting types

[cascardo/ovs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 75ccadf..49010b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,12 +73,14 @@ docs = \
        INSTALL.md \
        INSTALL.Debian.md \
        INSTALL.Docker.md \
+       INSTALL.DPDK-ADVANCED.md \
        INSTALL.DPDK.md \
        INSTALL.Fedora.md \
        INSTALL.KVM.md \
        INSTALL.Libvirt.md \
        INSTALL.NetBSD.md \
        INSTALL.RHEL.md \
+       INSTALL.SELinux.md \
        INSTALL.SSL.md \
        INSTALL.XenServer.md \
        INSTALL.userspace.md \
@@ -92,25 +94,28 @@ docs = \
        README-native-tunneling.md \
        REPORTING-BUGS.md \
        SECURITY.md \
-       TODO.md \
        WHY-OVS.md
 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 \
        build-aux/xml2nroff \
        $(MAN_FRAGMENTS) \
        $(MAN_ROOTS) \
-       Vagrantfile
+       Vagrantfile \
+       Vagrantfile-FreeBSD
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
@@ -247,7 +252,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>."; \
@@ -370,6 +375,7 @@ flake8-check: $(FLAKE8_PYFILES)
                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
@@ -383,17 +389,24 @@ $(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
+
+clang-analyze: clean
+       @which clang scan-build >/dev/null 2>&1 || \
+               (echo "Unable to find clang/scan-build, Install clang,clang-analyzer packages"; exit 1)
+       @$(MKDIR_P) "$(srcdir)/tests/clang-analyzer-results"
+       @scan-build -o $(srcdir)/tests/clang-analyzer-results --use-cc=$(CC) $(MAKE)
+.PHONY: clang-analyze
 
 dist-hook: $(DIST_HOOKS)
 all-local: $(ALL_LOCAL)
@@ -431,3 +444,4 @@ include datapath-windows/automake.mk
 include datapath-windows/include/automake.mk
 include windows/automake.mk
 include ovn/automake.mk
+include selinux/automake.mk