From 6cd2958fa4349c0f042b088f3d85f519542a4540 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Thu, 23 Aug 2012 23:09:48 +0000 Subject: [PATCH] merged build fix from RC_0_16 --- examples/Makefile.am | 2 +- tools/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index 81487636b..d080392c7 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -43,6 +43,6 @@ LDADD = $(top_builddir)/src/libtorrent-rasterbar.la AM_CPPFLAGS = -ftemplate-depth-50 -I$(top_srcdir)/include @DEBUGFLAGS@ -#AM_LDFLAGS = ${LDLAGS} -L./ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@ +AM_LDFLAGS = @BOOST_SYSTEM_LIB@ #AM_LDFLAGS = $(LDFLAGS) @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@ #AM_LDFLAGS = @OPENSSL_LDFLAGS@ diff --git a/tools/Makefile.am b/tools/Makefile.am index e93b856a1..bb1ea8969 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,6 +15,6 @@ LDADD = $(top_builddir)/src/libtorrent-rasterbar.la AM_CPPFLAGS = -ftemplate-depth-50 -I$(top_srcdir)/include @DEBUGFLAGS@ -#AM_LDFLAGS = ${LDLAGS} -L./ @BOOST_SYSTEM_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@ +AM_LDFLAGS = @BOOST_SYSTEM_LIB@ #AM_LDFLAGS = $(LDFLAGS) @BOOST_SYSTEM_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@ #AM_LDFLAGS = @OPENSSL_LDFLAGS@