Merge branch 'mainstream'

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c0e2787..a070ef4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,15 +10,20 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
+AM_LDFLAGS = $(SSL_LDFLAGS)
 
 if WIN32
 AM_CPPFLAGS += -I $(top_srcdir)/include/windows
+AM_CPPFLAGS += $(PTHREAD_INCLUDES)
+AM_LDFLAGS += $(PTHREAD_LDFLAGS)
 endif
 
 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 +63,7 @@ EXTRA_DIST = \
        FAQ \
        INSTALL \
        INSTALL.Debian \
+        INSTALL.DPDK \
        INSTALL.Fedora \
        INSTALL.KVM \
        INSTALL.Libvirt \
@@ -70,8 +76,6 @@ EXTRA_DIST = \
        NOTICE \
        OPENFLOW-1.1+ \
        PORTING \
-       README-OFTest \
-       README-gcov \
        README-lisp \
        REPORTING-BUGS \
        SubmittingPatches \
@@ -142,10 +146,9 @@ SUFFIXES += .in
                 -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
             > $@.tmp
        @if head -n 1 $@.tmp | grep '#!' > /dev/null; then \
-           echo chmod +x $@.tmp; \
            chmod +x $@.tmp; \
        fi
-       mv $@.tmp $@
+       $(AM_V_GEN) mv $@.tmp $@
 
 .PHONY: clean-pycov
 clean-pycov:
@@ -263,7 +266,8 @@ manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
                if grep warning: $@.tmp; then error=:; fi; \
                rm -f $@.tmp; \
        done; \
-       if $$error; then exit 1; else echo touch $@; touch $@; fi
+       if $$error; then exit 1; else touch $@; fi
+       $(AM_V_GEN) touch -c $@
 CLEANFILES += manpage-check
 endif