1 files changed, 47 insertions, 9 deletions

diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
index 02f4af67..b33f1cef 100644
--- a/auto_tests/Makefile.inc
+++ b/auto_tests/Makefile.inc
@@ -1,7 +1,7 @@
 if BUILD_TESTS
 
-TESTS = messenger_autotest# crypto_test network_test assoc_test onion_test TCP_test tox_test
-check_PROGRAMS = messenger_autotest# crypto_test network_test assoc_test onion_test TCP_test tox_test
+TESTS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test
+check_PROGRAMS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test
 
 AUTOTEST_CFLAGS = \
                          $(LIBSODIUM_CFLAGS) \
@@ -20,8 +20,8 @@ AUTOTEST_LDADD = \
 
 
 if BUILD_AV
-TESTS += toxav_basic_test #toxav_many_test
-check_PROGRAMS += toxav_basic_test #toxav_many_test
+TESTS += toxav_basic_test toxav_many_test
+check_PROGRAMS += toxav_basic_test toxav_many_test
 AUTOTEST_LDADD += libtoxav.la
 endif
 
@@ -32,7 +32,46 @@ messenger_autotest_CFLAGS = $(AUTOTEST_CFLAGS)
 messenger_autotest_LDADD = $(AUTOTEST_LDADD)
 
 
+crypto_test_SOURCES = ../auto_tests/crypto_test.c
 
+crypto_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+crypto_test_LDADD = $(AUTOTEST_LDADD)
+
+
+network_test_SOURCES = ../auto_tests/network_test.c
+
+network_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+network_test_LDADD = $(AUTOTEST_LDADD)
+
+
+assoc_test_SOURCES = ../auto_tests/assoc_test.c
+
+assoc_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+assoc_test_LDADD = $(AUTOTEST_LDADD)
+
+
+onion_test_SOURCES = ../auto_tests/onion_test.c
+
+onion_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+onion_test_LDADD = $(AUTOTEST_LDADD)
+
+
+TCP_test_SOURCES = ../auto_tests/TCP_test.c
+
+TCP_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+TCP_test_LDADD = $(AUTOTEST_LDADD)
+
+
+tox_test_SOURCES = ../auto_tests/tox_test.c
+
+tox_test_CFLAGS = $(AUTOTEST_CFLAGS)
+
+tox_test_LDADD = $(AUTOTEST_LDADD)
 
 
 
@@ -44,14 +83,13 @@ toxav_basic_test_CFLAGS = $(AUTOTEST_CFLAGS)
 toxav_basic_test_LDADD = $(AUTOTEST_LDADD)
 
 
-#toxav_many_test_SOURCES = ../auto_tests/toxav_many_test.c
+toxav_many_test_SOURCES = ../auto_tests/toxav_many_test.c
 
-#toxav_many_test_CFLAGS = $(AUTOTEST_CFLAGS)
+toxav_many_test_CFLAGS = $(AUTOTEST_CFLAGS)
 
-#toxav_many_test_LDADD = $(AUTOTEST_LDADD)
+toxav_many_test_LDADD = $(AUTOTEST_LDADD)
 endif
 
 endif
 
-EXTRA_DIST +=           $(top_srcdir)/auto_tests/friends_test.c
-
+EXTRA_DIST += $(top_srcdir)/auto_tests/friends_test.c
\ No newline at end of file