X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=0b59280baa9fdf576b7e7a4ef73ebbda9388c498;hb=003ce655b7116d18c86a74c50391e54990346931;hp=340b12dbe6d779713abb647575ceaca1e56a2ae2;hpb=cf06c2e944306a0bfa37813882d2b59dc6122b09;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 340b12dbe..0b59280ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,14 +14,16 @@ AM_LDFLAGS = $(SSL_LDFLAGS)
 
 if WIN32
 AM_CPPFLAGS += -I $(top_srcdir)/include/windows
+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)
 
@@ -56,11 +58,13 @@ DISTCLEANFILES =
 PYCOV_CLEAN_FILES = build-aux/check-structs,cover
 EXTRA_DIST = \
 	BUILD.Windows \
+	CONTRIBUTING \
 	CodingStyle \
 	DESIGN \
 	FAQ \
 	INSTALL \
 	INSTALL.Debian \
+        INSTALL.DPDK \
 	INSTALL.Fedora \
 	INSTALL.KVM \
 	INSTALL.Libvirt \
@@ -73,11 +77,9 @@ EXTRA_DIST = \
 	NOTICE \
 	OPENFLOW-1.1+ \
 	PORTING \
-	README-OFTest \
-	README-gcov \
 	README-lisp \
 	REPORTING-BUGS \
-	SubmittingPatches \
+	TODO \
 	WHY-OVS \
 	boot.sh \
 	build-aux/cccl \
@@ -246,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"; \