X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=0faed67952b688659c650a75d522286b7a75a804;hb=38b7a52b618b98f03f089d0dff4050ec76fd06d4;hp=50c4b14283781d5efdae2a84a32db228a0e25bcb;hpb=b4e1bf8b7ef8704d857a9ee93d40719289b2139e;p=sliver-openvswitch.git diff --git a/Makefile.am b/Makefile.am index 50c4b1428..0faed6795 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Nicira, Inc. +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -22,15 +22,23 @@ AM_CPPFLAGS += -DNDEBUG AM_CFLAGS += -fomit-frame-pointer endif +if WIN32 +psep=";" +else +psep=":" +endif # PYTHONDONTWRITEBYTECODE=yes keeps Python from creating .pyc and .pyo # files. Creating .py[co] works OK for any given version of Open # 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. -run_python = \ - PYTHONDONTWRITEBYTECODE=yes \ - PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH \ - $(PYTHON) +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) + ALL_LOCAL = BUILT_SOURCES = @@ -39,25 +47,31 @@ CLEAN_LOCAL = DISTCLEANFILES = PYCOV_CLEAN_FILES = build-aux/check-structs,cover EXTRA_DIST = \ + BUILD.Windows \ CodingStyle \ DESIGN \ FAQ \ + INSTALL \ + INSTALL.Debian \ + INSTALL.Fedora \ INSTALL.KVM \ INSTALL.Libvirt \ - INSTALL.Linux \ INSTALL.RHEL \ INSTALL.SSL \ INSTALL.XenServer \ - INSTALL.bridge \ INSTALL.userspace \ IntegrationGuide \ NOTICE \ + OPENFLOW-1.1+ \ PORTING \ + README-OFTest \ README-gcov \ + README-lisp \ REPORTING-BUGS \ SubmittingPatches \ WHY-OVS \ boot.sh \ + build-aux/cccl \ build-aux/sodepends.pl \ build-aux/soexpand.pl \ $(MAN_FRAGMENTS) \ @@ -79,7 +93,7 @@ MAN_FRAGMENTS = MAN_ROOTS = noinst_DATA = noinst_HEADERS = -noinst_LIBRARIES = +lib_LTLIBRARIES = noinst_man_MANS = noinst_PROGRAMS = noinst_SCRIPTS = @@ -108,6 +122,7 @@ SUFFIXES += .in 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' \ @@ -166,17 +181,71 @@ CLEANFILES += distfiles endif .PHONY: dist-hook-git -# Check that "struct vlog_ratelimit" is always declared "static". -ALL_LOCAL += rate-limit-check -rate-limit-check: +# Check that every .c file includes . +ALL_LOCAL += config-h-check +config-h-check: + @cd $(srcdir); \ + if test -e .git && (git --version) >/dev/null 2>&1 && \ + git --no-pager grep -L '#include ' `git ls-files | grep '\.c$$' | \ + grep -vE '^datapath|^lib/sflow|^third-party'`; \ + then \ + echo "See above for list of violations of the rule that"; \ + echo "every C source file must #include ."; \ + exit 1; \ + fi +.PHONY: config-h-check + +# Check for printf() type modifiers that MSVC doesn't support. +ALL_LOCAL += printf-check +printf-check: + @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \ + git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not -e 'ovs_scan' `git ls-files $(srcdir) | grep '\.[ch]$$'`; \ + then \ + echo "See above for list of violations of the rule that"; \ + echo "'z', 't', 'j', 'hh' printf() type modifiers are"; \ + echo "forbidden. See CodingStyle for replacements."; \ + exit 1; \ + fi +.PHONY: printf-check + +# Check that certain data structures are always declared "static". +ALL_LOCAL += static-check +static-check: @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \ - git --no-pager grep -n -E '^[ ]+struct vlog_rate_limit.*=' $(srcdir); \ + git --no-pager grep -n -E '^[ ]+(struct vlog_rate_limit|pthread_once_t|struct ovsthread_once).*=' $(srcdir); \ then \ echo "See above for list of violations of the rule that "; \ - echo "'struct vlog_rate_limit' must always be 'static'"; \ + echo "certain data structures must always be 'static'"; \ exit 1; \ fi -.PHONY: rate-limit-check +.PHONY: static-check + +# Check that assert.h is not used outside a whitelist of files. +ALL_LOCAL += check-assert-h-usage +check-assert-h-usage: + @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \ + (cd $(srcdir) && git --no-pager grep -l -E '[<]assert.h[>]') | \ + $(EGREP) -v '^lib/(sflow_receiver|vlog).c$$|^tests/'; \ + then \ + echo "Files listed above unexpectedly #include <""assert.h"">."; \ + echo "Please use ovs_assert (from util.h) instead of assert."; \ + exit 1; \ + fi +.PHONY: check-assert-h-usage + +ALL_LOCAL += thread-safety-check +thread-safety-check: + @if test -e '$(srcdir)'/.git && (git --version) >/dev/null 2>&1 && \ + grep -n -f '$(srcdir)'/build-aux/thread-safety-blacklist \ + `git ls-files '$(srcdir)' | grep '\.[ch]$$' \ + | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` \ + | $(EGREP) -v ':[ ]*/?\*'; \ + then \ + echo "See above for list of calls to functions that are"; \ + echo "blacklisted due to thread safety issues"; \ + exit 1; \ + fi +EXTRA_DIST += build-aux/thread-safety-blacklist if HAVE_GROFF ALL_LOCAL += manpage-check @@ -209,6 +278,12 @@ install-data-local: $(INSTALL_DATA_LOCAL) uninstall-local: $(UNINSTALL_LOCAL) .PHONY: $(DIST_HOOKS) $(CLEAN_LOCAL) $(INSTALL_DATA_LOCAL) $(UNINSTALL_LOCAL) +modules_install: +if LINUX_ENABLED + cd datapath/linux && $(MAKE) modules_install +endif + +include m4/automake.mk include lib/automake.mk include ofproto/automake.mk include utilities/automake.mk @@ -222,3 +297,5 @@ 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