-# Copyright (C) 2007-2015 Nicira, Inc.
+# Copyright (C) 2007-2016 Nicira, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
AM_CPPFLAGS += $(PTHREAD_INCLUDES)
AM_CPPFLAGS += $(MSVC_CFLAGS)
AM_LDFLAGS += $(PTHREAD_LDFLAGS)
+AM_LDFLAGS += $(MSVC64_LDFLAGS)
endif
AM_CPPFLAGS += -I $(top_srcdir)/include
# vSwitch, but it causes trouble if you switch from a version with
# foo/__init__.py into an (older) version with plain foo.py, since
# foo/__init__.pyc will cause Python to ignore foo.py.
-if INCLUDE_PYTHON_COMPAT
-run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$(top_srcdir)/python/compat$(psep)$$PYTHONPATH
-else
-run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH
-endif
-run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
-
+run_python = \
+ PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \
+ PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
ALL_LOCAL =
BUILT_SOURCES =
# A list of Markdown-formatted documentation that will automatically be
# included in the "make dist-docs" output.
docs = \
- appveyor.yml \
CONTRIBUTING.md \
CodingStyle.md \
DESIGN.md \
INSTALL.userspace.md \
INSTALL.Windows.md \
IntegrationGuide.md \
+ MAINTAINERS.md \
OPENFLOW-1.1+.md \
PORTING.md \
README.md \
.travis.yml \
.travis/build.sh \
.travis/prepare.sh \
+ appveyor.yml \
boot.sh \
build-aux/cccl \
+ build-aux/cksum-schema-check \
build-aux/dist-docs \
build-aux/sodepends.pl \
build-aux/soexpand.pl \
pkgdata_DATA =
sbin_SCRIPTS =
scripts_SCRIPTS =
+completion_SCRIPTS =
scripts_DATA =
SUFFIXES =
check_DATA =
check_SCRIPTS =
pkgconfig_DATA =
+FLAKE8_PYFILES =
scriptsdir = $(pkgdatadir)/scripts
+completiondir = $(sysconfdir)/bash_completion.d
pkgconfigdir = $(libdir)/pkgconfig
# This ensures that files added to EXTRA_DIST are always distributed,
-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
-e 's,[@]bindir[@],$(bindir),g' \
-e 's,[@]sbindir[@],$(sbindir),g' \
+ -e 's,[@]abs_builddir[@],$(abs_builddir),g' \
-e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
> $@.tmp
@if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
fi
$(AM_V_at) mv $@.tmp $@
+SUFFIXES += .xml
+%: %.xml
+ $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/xml2nroff $< > $@.tmp \
+ -I $(srcdir) \
+ --version=$(VERSION) \
+ PKIDIR='$(PKIDIR)' \
+ LOGDIR='$(LOGDIR)' \
+ DBDIR='$(DBDIR)' \
+ PERL='$(PERL)' \
+ PYTHON='$(PYTHON)' \
+ RUNDIR='$(RUNDIR)' \
+ VERSION='$(VERSION)' \
+ localstatedir='$(localstatedir)' \
+ pkgdatadir='$(pkgdatadir)' \
+ sysconfdir='$(sysconfdir)' \
+ bindir='$(bindir)' \
+ sbindir='$(sbindir)'
+ $(AM_v_at)mv $@.tmp $@
+
.PHONY: clean-pycov
clean-pycov:
cd $(srcdir) && rm -f $(PYCOV_CLEAN_FILES)
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 \
- echo "The distribution is missing the following files:"; \
+ echo "The following files are in git but not the distribution:"; \
cat missing-distfiles; \
exit 1; \
fi; \
exit 1; \
fi
EXTRA_DIST += build-aux/thread-safety-blacklist
+.PHONY: thread-safety-check
if HAVE_GROFF
ALL_LOCAL += manpage-check
CLEANFILES += manpage-check
endif
+if HAVE_FLAKE8
+ALL_LOCAL += flake8-check
+# http://flake8.readthedocs.org/en/latest/warnings.html
+# All warnings explicitly selected or ignored should be listed below.
+#
+# E***, W*** -- warnings from pep8
+# E121 continuation line under-indented for hanging indent (only from flake8 v2.0)
+# E123 closing bracket does not match indentation of opening bracket's line
+# E125 continuation line with same indent as next logical line (only from flake8 v2.0)
+# E126 continuation line over-indented for hanging indent
+# E127 continuation line over-indented for visual indent
+# 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
+# W503 line break before 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
+# H*** -- warnings from flake8 hacking plugin (custom style checks beyond PEP8)
+# H231 Python 3.x incompatible 'except x,y:' construct
+# H232 Python 3.x incompatible octal 077 should be written as 0o77
+# 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 ${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
+
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
if VSTUDIO_DDK
ALL_LOCAL += ovsext_make
ovsext_make: datapath-windows/ovsext.sln
- MSBuild.exe datapath-windows/ovsext.sln /target:Build /property:Configuration="$(VSTUDIO_CONFIG)"
+ 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)"
CLEAN_LOCAL += ovsext_clean
ovsext_clean: datapath-windows/ovsext.sln
- MSBuild.exe datapath-windows/ovsext.sln /target:Clean /property:Configuration="$(VSTUDIO_CONFIG)"
+ 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)"
endif
+.PHONY: ovsext_make
dist-hook: $(DIST_HOOKS)
all-local: $(ALL_LOCAL)
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
include m4/automake.mk
include lib/automake.mk
include ofproto/automake.mk
include rhel/automake.mk
include xenserver/automake.mk
include python/automake.mk
-include python/compat/automake.mk
include tutorial/automake.mk
include vtep/automake.mk
include datapath-windows/automake.mk
include datapath-windows/include/automake.mk
+include windows/automake.mk
+include ovn/automake.mk