Setting tag sliver-openvswitch-2.2.90-1

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 670f5f0..689faff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -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)
 
@@ -53,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 \
@@ -70,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 \
@@ -140,13 +145,11 @@ SUFFIXES += .in
                 -e 's,[@]bindir[@],$(bindir),g' \
                 -e 's,[@]sbindir[@],$(sbindir),g' \
                 -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \
-                -e 's,[@]ovsdbmonitordir[@],$(ovsdbmonitordir),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:
@@ -246,7 +249,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"; \
@@ -264,7 +267,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