Merge pull request #462 from ssiloti/RC_1_1

build dist fixes

Makefile.am

@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-#DISTCHECK_CONFIGURE_FLAGS = --enable-tests
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tests=yes
 
 SUBDIRS = include/libtorrent src examples test bindings tools
 
@@ -94,17 +94,17 @@ DOCS_PAGES = \
   docs/utp.rst                    \
   docs/streaming.rst              \
   docs/reference-Alerts.html      \
+  docs/reference-Bdecoding.html   \
   docs/reference-Bencoding.html   \
   docs/reference-Core.html        \
   docs/reference-Create_Torrents.html \
   docs/reference-Custom_Storage.html \
+  docs/reference-ed25519.html     \
   docs/reference-Error_Codes.html \
   docs/reference-Filter.html      \
   docs/reference-Plugins.html     \
-  docs/reference-Session.html     \
   docs/reference-Settings.html    \
   docs/reference-Storage.html     \
-  docs/reference-Time.html        \
   docs/reference-Utility.html     \
   docs/reference.html
 

docs/gen_reference_doc.py

@@ -149,7 +149,7 @@ def is_visible(desc):
 	return True
 
 def highlight_signature(s):
-	name = s.split('(')
+	name = s.split('(', 1)
 	name2 = name[0].split(' ')
 	if len(name2[-1]) == 0: return s
 
@@ -168,6 +168,9 @@ def highlight_signature(s):
 	# we also have to escape colons
 	name[1] = name[1].replace(':', '\\:')
 
+	# escape trailing underscores
+	name[1] = name[1].replace('_', '\\_')
+
 	# comments in signatures are italic
 	name[1] = name[1].replace('/\\*', '*/\\*')
 	name[1] = name[1].replace('\\*/', '\\*/*')

test/Makefile.am

@@ -101,7 +101,7 @@ EXTRA_PROGRAMS = $(test_programs) $(benchmark_programs)
 
 noinst_HEADERS = test.hpp setup_transfer.hpp dht_server.hpp \
   peer_server.hpp udp_tracker.hpp web_seed_suite.hpp swarm_suite.hpp \
-  test_utils.hpp settings.hpp
+  test_utils.hpp settings.hpp make_torrent.hpp
 
 libtest_la_SOURCES = main.cpp \
   test.cpp \
@@ -109,6 +109,7 @@ libtest_la_SOURCES = main.cpp \
   dht_server.cpp \
   udp_tracker.cpp \
   peer_server.cpp \
+  make_torrent.cpp \
   web_seed_suite.cpp \
   swarm_suite.cpp \
   test_utils.cpp \