X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=8e87557859ce849d25d616721e3bd5987b49666c;hb=bdd534291ff72077390f7b1745c4443ad3833d99;hp=c0e2787c4306e1a39fb28da4c73e0d3ac5713024;hpb=fe29af4c888d48cc1f16b1a247c2ffb6f0864522;p=sliver-openvswitch.git diff --git a/Makefile.am b/Makefile.am index c0e2787c4..8e8755785 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 @@ -142,10 +145,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 +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