datapath: RCU dereference correct pointer in table.

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fd6c56c..457513c 100644 (file)
--- 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)
@@ -43,6 +42,7 @@ EXTRA_DIST = \
        README-gcov \
        REPORTING-BUGS \
        SubmittingPatches \
+       WHY-OVS \
        boot.sh
 bin_PROGRAMS =
 sbin_PROGRAMS =
@@ -68,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 -*- */'
@@ -89,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
@@ -132,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