X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=0b59280baa9fdf576b7e7a4ef73ebbda9388c498;hb=28c5588e8e1a8d091c5d2275232c35f2968a97fa;hp=dd0a1117b87c6f380a63a6debc1b3d2d1ba825b4;hpb=8a9562d21a40c765a8ae6775a070cb279cb2147a;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index dd0a1117b..0b59280ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,12 +18,12 @@ AM_CPPFLAGS += $(PTHREAD_INCLUDES)
 AM_LDFLAGS += $(PTHREAD_LDFLAGS)
 endif
 
-AM_CPPFLAGS += $(SSL_INCLUDES)
-
 AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
 AM_CPPFLAGS += -I $(top_builddir)/lib
 
+AM_CPPFLAGS += $(SSL_INCLUDES)
+
 AM_CFLAGS = -Wstrict-prototypes
 AM_CFLAGS += $(WARNING_FLAGS)
 
@@ -58,6 +58,7 @@ DISTCLEANFILES =
 PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
 	BUILD.Windows \
+	CONTRIBUTING \
 	CodingStyle \
 	DESIGN \
 	FAQ \
@@ -78,7 +79,7 @@ EXTRA_DIST = \
 	PORTING \
 	README-lisp \
 	REPORTING-BUGS \
-	SubmittingPatches \
+	TODO \
 	WHY-OVS \
 	boot.sh \
 	build-aux/cccl \
@@ -247,7 +248,7 @@ thread-safety-check:
 	@if test -e '$(srcdir)'/.git && (git --version) >/dev/null 2>&1 && \
 	   grep -n -f '$(srcdir)'/build-aux/thread-safety-blacklist \
 	       `git ls-files '$(srcdir)' | grep '\.[ch]$$' \
-                | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` \
+                | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \
 	       | $(EGREP) -v ':[ 	]*/?\*'; \
 	then \
 	    echo "See above for list of calls to functions that are"; \