diff --git a/configure.in b/configure.in index 914dc52cd..ba340654c 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ AC_PREREQ(2.59) AC_INIT(src/torrent.cpp) -AM_INIT_AUTOMAKE(libtorrent, 0.13) +AM_INIT_AUTOMAKE(libtorrent, 0.14) # Nowhere in the source is config.h included, so make defines command line arguments # AM_CONFIG_HEADER(config.h) diff --git a/include/Makefile.am b/include/Makefile.am index 9dd9baff7..7fe59a4fd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -33,6 +33,7 @@ libtorrent/peer_connection.hpp \ libtorrent/bt_peer_connection.hpp \ libtorrent/web_peer_connection.hpp \ libtorrent/pe_crypto.hpp \ +libtorrent/magnet_uri.hpp \ libtorrent/natpmp.hpp \ libtorrent/pch.hpp \ libtorrent/peer_id.hpp \ @@ -53,7 +54,6 @@ libtorrent/socks4_stream.hpp \ libtorrent/socks5_stream.hpp \ libtorrent/stat.hpp \ libtorrent/storage.hpp \ -libtorrent/mapped_storage.hpp \ libtorrent/time.hpp \ libtorrent/torrent.hpp \ libtorrent/torrent_handle.hpp \ @@ -61,6 +61,7 @@ libtorrent/torrent_info.hpp \ libtorrent/tracker_manager.hpp \ libtorrent/udp_tracker_connection.hpp \ libtorrent/utf8.hpp \ +libtorrent/upnp.hpp \ libtorrent/xml_parse.hpp \ libtorrent/variant_stream.hpp \ libtorrent/version.hpp \ diff --git a/src/Makefile.am b/src/Makefile.am index ba686bf98..1e9e9f923 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ http_tracker_connection.cpp udp_tracker_connection.cpp \ alert.cpp identify_client.cpp ip_filter.cpp file.cpp metadata_transfer.cpp \ logger.cpp file_pool.cpp ut_pex.cpp lsd.cpp upnp.cpp instantiate_connection.cpp \ socks5_stream.cpp socks4_stream.cpp http_stream.cpp connection_queue.cpp \ -disk_io_thread.cpp ut_metadata.cpp \ +disk_io_thread.cpp ut_metadata.cpp magnet_uri.cpp \ $(kademlia_sources) noinst_HEADERS = \ diff --git a/test/Makefile.am b/test/Makefile.am index 28bb019a4..0033e64df 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -39,4 +39,4 @@ test_bandwidth_limiter_LDADD = $(top_builddir)/src/libtorrent.la noinst_HEADERS = test.hpp setup_transfer.hpp AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -AM_LDFLAGS= -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@ +AM_LDFLAGS= -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@