X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=b15a9a4d375b217c9faa367627c04dc39d429de6;hb=eced3be9ddbf20bddb4e10dfaa6f40558187ab1f;hp=ec674b77339954e6d822a23447ebf9f5ac5355f5;hpb=44852fdf6335927b44ac7ebb348efa782a7f08de;p=sliver-openvswitch.git diff --git a/Makefile.am b/Makefile.am index ec674b773..b15a9a4d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011 Nicira Networks, 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 @@ -20,33 +20,51 @@ AM_CFLAGS += $(WARNING_FLAGS) if NDEBUG AM_CPPFLAGS += -DNDEBUG AM_CFLAGS += -fomit-frame-pointer -else -AM_LDFLAGS = -export-dynamic 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) + ALL_LOCAL = BUILT_SOURCES = CLEANFILES = CLEAN_LOCAL = DISTCLEANFILES = +PYCOV_CLEAN_FILES = build-aux/check-structs,cover EXTRA_DIST = \ CodingStyle \ DESIGN \ + FAQ \ + INSTALL \ + INSTALL.Debian \ + INSTALL.Fedora \ INSTALL.KVM \ - INSTALL.Linux \ + INSTALL.Libvirt \ INSTALL.RHEL \ INSTALL.SSL \ INSTALL.XenServer \ - INSTALL.bridge \ INSTALL.userspace \ + IntegrationGuide \ NOTICE \ + OPENFLOW-1.1+ \ PORTING \ README-gcov \ + README-lisp \ REPORTING-BUGS \ SubmittingPatches \ WHY-OVS \ boot.sh \ - $(MAN_FRAGMENTS) + build-aux/sodepends.pl \ + build-aux/soexpand.pl \ + $(MAN_FRAGMENTS) \ + $(MAN_ROOTS) bin_PROGRAMS = sbin_PROGRAMS = bin_SCRIPTS = @@ -56,10 +74,12 @@ dist_pkgdata_DATA = dist_pkgdata_SCRIPTS = dist_sbin_SCRIPTS = dist_scripts_SCRIPTS = +dist_scripts_DATA = INSTALL_DATA_LOCAL = UNINSTALL_LOCAL = man_MANS = MAN_FRAGMENTS = +MAN_ROOTS = noinst_DATA = noinst_HEADERS = noinst_LIBRARIES = @@ -70,6 +90,7 @@ OVSIDL_BUILT = pkgdata_DATA = sbin_SCRIPTS = scripts_SCRIPTS = +scripts_DATA = SUFFIXES = check_DATA = @@ -81,23 +102,21 @@ scriptsdir = $(pkgdatadir)/scripts # http://article.gmane.org/gmane.comp.sysutils.automake.general/10891 noinst_HEADERS += $(EXTRA_DIST) -EXTRA_DIST += \ - soexpand.pl - ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */' ro_shell = printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' SUFFIXES += .in .in: - $(PERL) $(srcdir)/soexpand.pl -I$(srcdir) < $< | \ + @mkdir -p $$(dirname $@) + $(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \ 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' \ - -e 's,[@]BUILDNR[@],$(BUILDNR),g' \ -e 's,[@]localstatedir[@],$(localstatedir),g' \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ @@ -112,15 +131,25 @@ SUFFIXES += .in fi mv $@.tmp $@ +.PHONY: clean-pycov +clean-pycov: + cd $(srcdir) && rm -f $(PYCOV_CLEAN_FILES) +CLEAN_LOCAL += clean-pycov + # If we're checked out from a Git repository, make sure that every # file that is in Git is distributed. +# +# We only enable this check when GNU make is in use because the +# Makefile in datapath/linux, needed to get the list of files to +# distribute, requires GNU make extensions. +if GNU_MAKE ALL_LOCAL += dist-hook-git dist-hook-git: distfiles @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \ (cd datapath && $(MAKE) distfiles); \ (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \ sort -u > all-distfiles; \ - (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \ + (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles | \ sort -u > all-gitfiles; \ comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \ if test -s missing-distfiles; then \ @@ -139,6 +168,22 @@ distfiles: Makefile sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@ CLEANFILES += distfiles +endif +.PHONY: dist-hook-git + +# 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 that "struct vlog_ratelimit" is always declared "static". ALL_LOCAL += rate-limit-check @@ -150,18 +195,45 @@ rate-limit-check: echo "'struct vlog_rate_limit' must always be 'static'"; \ exit 1; \ fi +.PHONY: rate-limit-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|worker).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 if HAVE_GROFF ALL_LOCAL += manpage-check -manpage-check: $(MANS) $(MAN_FRAGMENTS) - @manpages=; \ - for d in $(MANS); do \ - manpages="$$manpages `test -f $$d || echo $(VPATH)/`$$d"; \ +manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS) + @error=false; \ + for manpage in $?; do \ + LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ + if grep warning: $@.tmp; then error=:; fi; \ + rm -f $@.tmp; \ done; \ - LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T ascii -man -p -z $$manpages && touch $@ + if $$error; then exit 1; else echo touch $@; touch $@; fi CLEANFILES += manpage-check 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 cmp -s $(@F).tmp $@; then \ + touch $@; \ + rm -f $(@F).tmp; \ + else \ + mv $(@F).tmp $@; \ + fi +CLEANFILES += manpage-dep-check + dist-hook: $(DIST_HOOKS) all-local: $(ALL_LOCAL) clean-local: $(CLEAN_LOCAL) @@ -169,6 +241,11 @@ 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 lib/automake.mk include ofproto/automake.mk include utilities/automake.mk @@ -180,4 +257,7 @@ include vswitchd/automake.mk include ovsdb/automake.mk include rhel/automake.mk include xenserver/automake.mk -include python/ovs/automake.mk +include python/automake.mk +include python/compat/automake.mk +include planetlab/automake.mk +include tutorial/automake.mk