X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=blobdiff_plain;f=Makefile.am;h=689faff88661c6c2a8f784fbda13f5e21f49875f;hp=b1ad24d9dafeee405a62d65e769d6965dae2b91a;hb=HEAD;hpb=9b4a53923a8a915c0c6a5365b392a7efd6f9bf71 diff --git a/Makefile.am b/Makefile.am index b1ad24d9d..689faff88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -10,10 +10,20 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = datapath AM_CPPFLAGS = $(SSL_CFLAGS) +AM_LDFLAGS = $(SSL_LDFLAGS) + +if WIN32 +AM_CPPFLAGS += -I $(top_srcdir)/include/windows +AM_CPPFLAGS += $(PTHREAD_INCLUDES) +AM_LDFLAGS += $(PTHREAD_LDFLAGS) +endif + AM_CPPFLAGS += -I $(top_srcdir)/include AM_CPPFLAGS += -I $(top_srcdir)/lib AM_CPPFLAGS += -I $(top_builddir)/lib +AM_CPPFLAGS += $(SSL_INCLUDES) + AM_CFLAGS = -Wstrict-prototypes AM_CFLAGS += $(WARNING_FLAGS) @@ -22,15 +32,20 @@ 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. if INCLUDE_PYTHON_COMPAT -run_python = PYTHONPATH=$(top_srcdir)/python:$(top_srcdir)/python/compat:$$PYTHONPATH +run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$(top_srcdir)/python/compat$(psep)$$PYTHONPATH else -run_python = PYTHONPATH=$(top_srcdir)/python:$$PYTHONPATH +run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH endif run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON) @@ -42,14 +57,18 @@ CLEAN_LOCAL = DISTCLEANFILES = PYCOV_CLEAN_FILES = build-aux/check-structs,cover EXTRA_DIST = \ + BUILD.Windows \ + CONTRIBUTING \ CodingStyle \ DESIGN \ FAQ \ INSTALL \ INSTALL.Debian \ + INSTALL.DPDK \ INSTALL.Fedora \ INSTALL.KVM \ INSTALL.Libvirt \ + INSTALL.NetBSD \ INSTALL.RHEL \ INSTALL.SSL \ INSTALL.XenServer \ @@ -58,13 +77,12 @@ EXTRA_DIST = \ NOTICE \ OPENFLOW-1.1+ \ PORTING \ - README-OFTest \ - README-gcov \ README-lisp \ REPORTING-BUGS \ - SubmittingPatches \ + TODO \ WHY-OVS \ boot.sh \ + build-aux/cccl \ build-aux/sodepends.pl \ build-aux/soexpand.pl \ $(MAN_FRAGMENTS) \ @@ -86,7 +104,7 @@ MAN_FRAGMENTS = MAN_ROOTS = noinst_DATA = noinst_HEADERS = -noinst_LIBRARIES = +lib_LTLIBRARIES = noinst_man_MANS = noinst_PROGRAMS = noinst_SCRIPTS = @@ -111,6 +129,7 @@ ro_shell = printf '\043 Generated automatically -- do not modify! -*- buffer- SUFFIXES += .in .in: + @mkdir -p $$(dirname $@) $(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \ sed \ -e 's,[@]PKIDIR[@],$(PKIDIR),g' \ @@ -126,13 +145,11 @@ SUFFIXES += .in -e 's,[@]bindir[@],$(bindir),g' \ -e 's,[@]sbindir[@],$(sbindir),g' \ -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \ - -e 's,[@]ovsdbmonitordir[@],$(ovsdbmonitordir),g' \ > $@.tmp @if head -n 1 $@.tmp | grep '#!' > /dev/null; then \ - echo chmod +x $@.tmp; \ chmod +x $@.tmp; \ fi - mv $@.tmp $@ + $(AM_V_GEN) mv $@.tmp $@ .PHONY: clean-pycov clean-pycov: @@ -151,10 +168,10 @@ 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$$' | \ - sort -u > all-gitfiles; \ - comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \ + LC_ALL=C sort -u > all-distfiles; \ + (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles | \ + 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:"; \ cat missing-distfiles; \ @@ -169,7 +186,8 @@ distfiles: Makefile list='$(DISTFILES)'; \ for file in $$list; do echo $$file; done | \ sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | sort -u > $@ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | \ + LC_ALL=C sort -u > $@ CLEANFILES += distfiles endif .PHONY: dist-hook-git @@ -188,6 +206,19 @@ config-h-check: 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: @@ -218,7 +249,7 @@ 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 '^datapath|^lib/sflow|^third-party'` /dev/null \ | $(EGREP) -v ':[ ]*/?\*'; \ then \ echo "See above for list of calls to functions that are"; \ @@ -236,7 +267,8 @@ manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS) if grep warning: $@.tmp; then error=:; fi; \ rm -f $@.tmp; \ done; \ - if $$error; then exit 1; else echo touch $@; touch $@; fi + if $$error; then exit 1; else touch $@; fi + $(AM_V_GEN) touch -c $@ CLEANFILES += manpage-check endif @@ -263,6 +295,7 @@ 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 @@ -276,5 +309,6 @@ include rhel/automake.mk include xenserver/automake.mk include python/automake.mk include python/compat/automake.mk +include planetlab/automake.mk include tutorial/automake.mk include vtep/automake.mk