14 files changed, 98 insertions, 82 deletions

diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
deleted file mode 100644
index 9bab6efb..00000000
--- a/testing/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-
-cmake_policy(SET CMP0011 NEW)
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_test.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/crypto_speed_test.cmake)
-
-if(WIN32)
-  #Do nothing
-else()
-        include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
-endif()
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 53369794..d14f9781 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -28,8 +28,8 @@
  */
 
 //#include "../core/network.h"
-#include "../core/DHT.h"
-#include "../core/friend_requests.h"
+#include "../toxcore/DHT.h"
+#include "../toxcore/friend_requests.h"
 #include "misc_tools.h"
 
 #include <string.h>
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index 09e9e0a3..af349863 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -28,8 +28,8 @@
  *
  */
 
-#include "../core/network.h"
-#include "../core/Lossless_UDP.h"
+#include "../toxcore/network.h"
+#include "../toxcore/Lossless_UDP.h"
 
 #ifdef WIN32
 
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index a82b787a..5c2cabd0 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -28,8 +28,8 @@
  *
  */
 
-#include "../core/network.h"
-#include "../core/Lossless_UDP.h"
+#include "../toxcore/network.h"
+#include "../toxcore/Lossless_UDP.h"
 
 //Sleep function (x = milliseconds)
 #ifdef WIN32
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
new file mode 100644
index 00000000..067b6ead
--- /dev/null
+++ b/testing/Makefile.inc
@@ -0,0 +1,89 @@
+if BUILD_NTOX
+
+bin_PROGRAMS += nTox
+
+nTox_SOURCES =          $(top_srcdir)/testing/misc_tools.h \
+                        $(top_srcdir)/testing/misc_tools.c \
+                        $(top_srcdir)/testing/nTox.h \
+                        $(top_srcdir)/testing/nTox.c
+
+nTox_CFLAGS =           $(LIBSODIUM_CFLAGS) \
+                        $(NCURSES_CFLAGS)
+
+nTox_LDADD =            $(LIBSODIUM_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(NCURSES_LIBS)
+
+endif
+
+
+noinst_PROGRAMS +=      DHT_test \
+                        Lossless_UDP_testclient \
+                        Lossless_UDP_testserver \
+                        Messenger_test \
+                        crypto_speed_test
+
+DHT_test_SOURCES =      $(top_srcdir)/testing/DHT_test.c \
+                        $(top_srcdir)/testing/misc_tools.h \
+                        $(top_srcdir)/testing/misc_tools.c
+
+DHT_test_CFLAGS =       $(LIBSODIUM_CFLAGS) 
+
+DHT_test_LDADD =        $(LIBSODIUM_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(WINSOCK2_LIBS)
+
+
+Lossless_UDP_testclient_SOURCES = \
+                        $(top_srcdir)/testing/Lossless_UDP_testclient.c
+
+Lossless_UDP_testclient_CFLAGS = \
+                        $(LIBSODIUM_CFLAGS)
+
+Lossless_UDP_testclient_LDADD = \
+                        $(LIBSODIUM_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(WINSOCK2_LIBS)
+
+
+Lossless_UDP_testserver_SOURCES = \
+                        $(top_srcdir)/testing/Lossless_UDP_testserver.c
+
+Lossless_UDP_testserver_CFLAGS = \
+                        $(LIBSODIUM_CFLAGS)
+
+Lossless_UDP_testserver_LDADD = \
+                        $(LIBSODIUM_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(WINSOCK2_LIBS)
+
+
+Messenger_test_SOURCES = \
+                        $(top_srcdir)/testing/Messenger_test.c \
+                        $(top_srcdir)/testing/misc_tools.h \
+                        $(top_srcdir)/testing/misc_tools.c
+
+Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS)
+
+Messenger_test_LDADD =  $(LIBSODIUM_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(WINSOCK2_LIBS)
+
+
+crypto_speed_test_SOURCES = \
+                        $(top_srcdir)/testing/crypto_speed_test.c
+
+crypto_speed_test_CFLAGS = \
+                        $(LIBSODIUM_CFLAGS)
+
+crypto_speed_test_LDADD = \
+                        $(LIBSODIUM_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(WINSOCK2_LIBS)
+
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index c76584d7..19fd9ab7 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -37,7 +37,7 @@
  *
  */
 
-#include "../core/Messenger.h"
+#include "../toxcore/Messenger.h"
 #include "misc_tools.h"
 
 #ifdef WIN32
diff --git a/testing/cmake/DHT_test.cmake b/testing/cmake/DHT_test.cmake
deleted file mode 100644
index bb5bf05f..00000000
--- a/testing/cmake/DHT_test.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(DHT_test C)
-
-set(exe_name DHT_test)
-
-add_executable(${exe_name}
-        DHT_test.c
-        misc_tools.c)
-
-linkCoreLibraries(${exe_name})
diff --git a/testing/cmake/Lossless_UDP_testclient.cmake b/testing/cmake/Lossless_UDP_testclient.cmake
deleted file mode 100644
index 5f651807..00000000
--- a/testing/cmake/Lossless_UDP_testclient.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(Lossless_UDP_testclient C)
-
-set(exe_name Lossless_UDP_testclient)
-
-add_executable(${exe_name}
-        Lossless_UDP_testclient.c)
-
-linkCoreLibraries(${exe_name})
diff --git a/testing/cmake/Lossless_UDP_testserver.cmake b/testing/cmake/Lossless_UDP_testserver.cmake
deleted file mode 100644
index 26f9302e..00000000
--- a/testing/cmake/Lossless_UDP_testserver.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(Lossless_UDP_testserver C)
-
-set(exe_name Lossless_UDP_testserver)
-
-add_executable(${exe_name}
-        Lossless_UDP_testserver.c)
-
-linkCoreLibraries(${exe_name})
diff --git a/testing/cmake/Messenger_test.cmake b/testing/cmake/Messenger_test.cmake
deleted file mode 100644
index 15fcd77b..00000000
--- a/testing/cmake/Messenger_test.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(Messenger_test C)
-
-set(exe_name Messenger_test)
-
-add_executable(${exe_name}
-        Messenger_test.c misc_tools.c)
-
-linkCoreLibraries(${exe_name})
diff --git a/testing/cmake/crypto_speed_test.cmake b/testing/cmake/crypto_speed_test.cmake
deleted file mode 100644
index c269af5b..00000000
--- a/testing/cmake/crypto_speed_test.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(crypto_speed_test C)
-
-set(exe_name crypto_speed_test)
-
-add_executable(${exe_name}
-        crypto_speed_test.c)
-
-linkCoreLibraries(${exe_name})
diff --git a/testing/cmake/nTox.cmake b/testing/cmake/nTox.cmake
deleted file mode 100644
index 44476b8f..00000000
--- a/testing/cmake/nTox.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(nTox C)
-
-set(exe_name nTox)
-
-add_executable(${exe_name}
-        nTox.c misc_tools.c)
-
-target_link_libraries(${exe_name}
-        ncurses)
-
-linkCoreLibraries(${exe_name})
diff --git a/testing/crypto_speed_test.c b/testing/crypto_speed_test.c
index a61b30e8..b06c25e1 100644
--- a/testing/crypto_speed_test.c
+++ b/testing/crypto_speed_test.c
@@ -28,7 +28,7 @@ double get_time()
 
 #endif
 
-#include "../core/net_crypto.h"
+#include "../toxcore/net_crypto.h"
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/testing/nTox.h b/testing/nTox.h
index b27a956f..df9d404a 100644
--- a/testing/nTox.h
+++ b/testing/nTox.h
@@ -35,7 +35,7 @@
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <netdb.h>
-#include "../core/tox.h"
+#include "../toxcore/tox.h"
 
 #define STRING_LENGTH 256
 #define HISTORY 50