X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=da4c1b334980bebb6e578e0f7e9c3644b49c74b2;hb=refs%2Fheads%2Forig-parallel;hp=37d98f601bc7794794f01eb74bf3ee6a483cf61d;hpb=87103e1fccd88e0fc8a64d774ddb620deeb90678;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 37d98f601..da4c1b334 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,6 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
-AM_CPPFLAGS += $(NCURSES_CFLAGS)
-AM_CPPFLAGS += $(PCRE_CFLAGS)
 AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
 
@@ -25,6 +23,7 @@ else
 AM_LDFLAGS = -export-dynamic
 endif
 
+ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
@@ -38,9 +37,11 @@ EXTRA_DIST = \
 	INSTALL.bridge \
 	INSTALL.userspace \
 	NOTICE \
+	PORTING \
 	README-gcov \
 	REPORTING-BUGS \
 	SubmittingPatches \
+	WHY-OVS \
 	boot.sh
 bin_PROGRAMS =
 sbin_PROGRAMS =
@@ -59,8 +60,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 -*- */'
@@ -111,6 +117,7 @@ dist-hook-git:
 DIST_HOOKS += dist-hook-git
 
 dist-hook: $(DIST_HOOKS)
+all-local: $(ALL_LOCAL)
 .PHONY: $(DIST_HOOKS)
 
 include lib/automake.mk
@@ -123,5 +130,4 @@ include debian/automake.mk
 include vswitchd/automake.mk
 include ovsdb/automake.mk
 include xenserver/automake.mk
-include extras/ezio/automake.mk
-
+include python/ovs/automake.mk