X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=8e87557859ce849d25d616721e3bd5987b49666c;hb=2d04b6ea214daf96020ce5ca994fcb5380556247;hp=670f5f0b2fc2645ff4c8eadbe250f1066a8a996a;hpb=4b0424809b823101c969a0691fc1db0c880ae64a;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 670f5f0b2..8e8755785 100644
--- 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,11 +10,14 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = datapath
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
+AM_LDFLAGS = $(SSL_LDFLAGS)
 
 if WIN32
 AM_CPPFLAGS += -I $(top_srcdir)/include/windows
 endif
 
+AM_CPPFLAGS += $(SSL_INCLUDES)
+
 AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
 AM_CPPFLAGS += -I $(top_builddir)/lib
@@ -140,13 +143,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:
@@ -264,7 +265,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