datapath: Fix build with backported netdev_alloc_skb_ip_align()

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c902e41..7183326 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ else
 AM_LDFLAGS = -export-dynamic
 endif
 
+ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
@@ -42,6 +43,7 @@ EXTRA_DIST = \
        README-gcov \
        REPORTING-BUGS \
        SubmittingPatches \
+       WHY-OVS \
        boot.sh
 bin_PROGRAMS =
 sbin_PROGRAMS =
@@ -60,8 +62,13 @@ noinst_SCRIPTS =
 OVSIDL_BUILT =
 SUFFIXES =
 
+# This ensures that files added to EXTRA_DIST are always distributed,
+# even if they are inside an Automake if...endif conditional block that is
+# disabled by some particular "configure" run.  For more information, see:
+# http://article.gmane.org/gmane.comp.sysutils.automake.general/10891
+noinst_HEADERS += $(EXTRA_DIST)
+
 EXTRA_DIST += \
-       build-aux/update-debian-changelog \
        soexpand.pl
 
 ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
@@ -112,6 +119,7 @@ dist-hook-git:
 DIST_HOOKS += dist-hook-git
 
 dist-hook: $(DIST_HOOKS)
+all-local: $(ALL_LOCAL)
 .PHONY: $(DIST_HOOKS)
 
 include lib/automake.mk