X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=457513cb9dd8853efe892c0860ef38f09022f779;hb=055dae4f7f6d3316ca326736f7b731db1bde0f09;hp=62d4d491b561a02e8b7d2d6b4ef6fe0eca9d7819;hpb=3c34dd48afdb134f74099c5b84fe5bdc33656023;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 62d4d491b..457513cb9 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)
@@ -69,7 +68,6 @@ SUFFIXES =
 noinst_HEADERS += $(EXTRA_DIST)
 
 EXTRA_DIST += \
-	build-aux/update-debian-changelog \
 	soexpand.pl
 
 ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
@@ -90,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
@@ -133,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