X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=Makefile.am;h=fd6c56ccbdf3a2ae7a06fc78d803d44329a51bbc;hb=4959755dc8512f6a0b19ce13138d6d001629904d;hp=c902e41d899384c51fd35e4f0a4c04bf6b2eedae;hpb=bc34d06037d11c106a1fb3df3940ee4231e5a246;p=openvswitch

diff --git a/Makefile.am b/Makefile.am
index c902e41d..fd6c56cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ else
 AM_LDFLAGS = -export-dynamic
 endif
 
+ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
@@ -60,6 +61,12 @@ 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
@@ -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