Merge branch 'mainstream'

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index da371d8..382f420 100644 (file)
--- 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 \
@@ -75,7 +79,6 @@ EXTRA_DIST = \
        PORTING \
        README-lisp \
        REPORTING-BUGS \
-       SubmittingPatches \
        WHY-OVS \
        boot.sh \
        build-aux/cccl \