meta-flow: Correctly set destination MAC in mf_set_flow_value().

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 91218e1..46de7fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,11 @@ EXTRA_DIST = \
        REPORTING-BUGS \
        SubmittingPatches \
        WHY-OVS \
-       boot.sh
+       boot.sh \
+       build-aux/sodepends.pl \
+       build-aux/soexpand.pl \
+       $(MAN_FRAGMENTS) \
+       $(MAN_ROOTS)
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =
@@ -55,8 +59,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 =
@@ -67,6 +75,7 @@ OVSIDL_BUILT =
 pkgdata_DATA =
 sbin_SCRIPTS =
 scripts_SCRIPTS =
+scripts_DATA =
 SUFFIXES =
 check_DATA =
 
@@ -78,15 +87,12 @@ 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) < $< | \
+       $(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
            sed \
                -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
@@ -148,11 +154,36 @@ rate-limit-check:
            exit 1; \
         fi
 
+if HAVE_GROFF
+ALL_LOCAL += manpage-check
+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; \
+       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)
 install-data-local: $(INSTALL_DATA_LOCAL)
-.PHONY: $(DIST_HOOKS) $(CLEAN_LOCAL) $(INSTALL_DATA_LOCAL)
+uninstall-local: $(UNINSTALL_LOCAL)
+.PHONY: $(DIST_HOOKS) $(CLEAN_LOCAL) $(INSTALL_DATA_LOCAL) $(UNINSTALL_LOCAL)
 
 include lib/automake.mk
 include ofproto/automake.mk
@@ -165,4 +196,5 @@ 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