X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=457513cb9dd8853efe892c0860ef38f09022f779;hb=e22d4953ec00df611fff0fd36ac81087c63e1d1e;hp=c902e41d899384c51fd35e4f0a4c04bf6b2eedae;hpb=bc34d06037d11c106a1fb3df3940ee4231e5a246;p=openvswitch

diff --git a/Makefile.am b/Makefile.am
index c902e41d..457513cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,10 +10,9 @@ 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
+AM_CPPFLAGS += -I $(top_builddir)/lib
 
 AM_CFLAGS = -Wstrict-prototypes
 AM_CFLAGS += $(WARNING_FLAGS)
@@ -25,6 +24,7 @@ else
 AM_LDFLAGS = -export-dynamic
 endif
 
+ALL_LOCAL =
 BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
@@ -42,6 +42,7 @@ EXTRA_DIST = \
 	README-gcov \
 	REPORTING-BUGS \
 	SubmittingPatches \
+	WHY-OVS \
 	boot.sh
 bin_PROGRAMS =
 sbin_PROGRAMS =
@@ -60,8 +61,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 -*- */'
@@ -82,7 +88,7 @@ SUFFIXES += .in
                 -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
                 -e 's,[@]ovsdbmonitordir[@],$(ovsdbmonitordir),g' \
             > $@.tmp
-	@if head -n 1 $@.tmp | grep -q '#!'; then \
+	@if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
 	    echo chmod +x $@.tmp; \
 	    chmod +x $@.tmp; \
 	fi
@@ -112,6 +118,7 @@ dist-hook-git:
 DIST_HOOKS += dist-hook-git
 
 dist-hook: $(DIST_HOOKS)
+all-local: $(ALL_LOCAL)
 .PHONY: $(DIST_HOOKS)
 
 include lib/automake.mk
@@ -124,5 +131,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