From 330d46a4c6b6d57054cd4ae1585e5315ec98812d Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 11 May 2014 03:14:53 +0000
Subject: [PATCH] makefile fixes (and add missing upnp.xml file)

---
 Makefile.am      | 25 ++++++++++++++++++++++++-
 src/Makefile.am  |  2 ++
 test/Makefile.am |  4 ++--
 test/upnp.xml    |  1 +
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 test/upnp.xml

diff --git a/Makefile.am b/Makefile.am
index 5164b657b..84fe9fcf0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,6 +126,27 @@ DOCS_PAGES = \
   docs/reference-Utility.html     \
   docs/reference.html
 
+ED25519_SOURCE = \
+	ed25519/readme.md \
+	ed25519/test.c \
+	ed25519/src/ed25519.h \
+	ed25519/src/fe.h \
+	ed25519/src/fixedint.h \
+	ed25519/src/ge.h \
+	ed25519/src/precomp_data.h \
+	ed25519/src/sc.h \
+	ed25519/src/sha512.h \
+	ed25519/src/add_scalar.c \
+	ed25519/src/fe.c \
+	ed25519/src/ge.c \
+	ed25519/src/key_exchange.c \
+	ed25519/src/keypair.c \
+	ed25519/src/sc.c \
+	ed25519/src/seed.c \
+	ed25519/src/sha512.c \
+	ed25519/src/sign.c \
+	ed25519/src/verify.c
+
 EXTRA_DIST = \
   Jamfile \
   Jamroot.jam \
@@ -134,7 +155,9 @@ EXTRA_DIST = \
   libtorrent-rasterbar.pc  \
   libtorrent-rasterbar-cmake.pc  \
   $(DOCS_PAGES) \
-  $(DOCS_IMAGES)
+  $(DOCS_IMAGES) \
+  $(ED25519_SOURCE)
 
 pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = libtorrent-rasterbar.pc
+
diff --git a/src/Makefile.am b/src/Makefile.am
index a3ab05d8f..f9d298e8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 lib_LTLIBRARIES = libtorrent-rasterbar.la
 
 if ENABLE_DHT
diff --git a/test/Makefile.am b/test/Makefile.am
index 9a4bca930..c7bcd2ed4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 test_programs = \
   test_bitfield              \
   test_file                  \
@@ -41,7 +43,6 @@ test_programs = \
   enum_if                    \
   test_utp                   \
   test_session               \
-  test_ssl                   \
   test_web_seed              \
   test_remap_files           \
   test_gzip                  \
@@ -170,7 +171,6 @@ test_upnp_SOURCES = test_upnp.cpp
 enum_if_SOURCES = enum_if.cpp
 test_utp_SOURCES = test_utp.cpp
 test_session_SOURCES = test_session.cpp
-test_ssl_SOURCES = test_ssl.cpp
 test_web_seed_SOURCES = test_web_seed.cpp
 test_remap_files_SOURCES = test_remap_files.cpp
 test_gzip_SOURCES = test_gzip.cpp
diff --git a/test/upnp.xml b/test/upnp.xml
new file mode 100644
index 000000000..2fc9362da
--- /dev/null
+++ b/test/upnp.xml
@@ -0,0 +1 @@
+<root><specVersion><major>1</major><minor>0</minor></specVersion><URLBase>http://127.0.0.1:59585</URLBase><device><deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType><presentationURL>http://192.168.0.1:80</presentationURL><friendlyName>D-Link Router</friendlyName><manufacturer>D-Link</manufacturer><manufacturerURL>http://www.dlink.com</manufacturerURL><modelDescription>Internet Access Router</modelDescription><modelName>D-Link Router</modelName><UDN>uuid:upnp-InternetGatewayDevice-1_0-12345678900001</UDN><UPC>123456789001</UPC><serviceList><service><serviceType>urn:schemas-upnp-org:service:Layer3Forwarding:1</serviceType><serviceId>urn:upnp-org:serviceId:L3Forwarding1</serviceId><controlURL>/Layer3Forwarding</controlURL><eventSubURL>/Layer3Forwarding</eventSubURL><SCPDURL>/Layer3Forwarding.xml</SCPDURL></service></serviceList><deviceList><device><deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType><friendlyName>WANDevice</friendlyName><manufacturer>D-Link</manufacturer><manufacturerURL>http://www.dlink.com</manufacturerURL><modelDescription>Internet Access Router</modelDescription><modelName>D-Link Router</modelName><modelNumber>1</modelNumber><modelURL>http://support.dlink.com</modelURL><serialNumber>12345678900001</serialNumber><UDN>uuid:upnp-WANDevice-1_0-12345678900001</UDN><UPC>123456789001</UPC><serviceList><service><serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType><serviceId>urn:upnp-org:serviceId:WANCommonInterfaceConfig</serviceId><controlURL>/WANCommonInterfaceConfig</controlURL><eventSubURL>/WANCommonInterfaceConfig</eventSubURL><SCPDURL>/WANCommonInterfaceConfig.xml</SCPDURL></service></serviceList><deviceList><device><deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType><friendlyName>WAN Connection Device</friendlyName><manufacturer>D-Link</manufacturer><manufacturerURL>http://www.dlink.com</manufacturerURL><modelDescription>Internet Access Router</modelDescription><modelName>D-Link Router</modelName><modelNumber>1</modelNumber><modelURL>http://support.dlink.com</modelURL><serialNumber>12345678900001</serialNumber><UDN>uuid:upnp-WANConnectionDevice-1_0-12345678900001</UDN><UPC>123456789001</UPC><serviceList><service><serviceType>urn:schemas-upnp-org:service:WANIPConnection:1</serviceType><serviceId>urn:upnp-org:serviceId:WANIPConnection</serviceId><controlURL>/WANIPConnection</controlURL><eventSubURL>/WANIPConnection</eventSubURL><SCPDURL>/WANIPConnection.xml</SCPDURL></service></serviceList></device></deviceList></device></deviceList></device></root>
\ No newline at end of file