summaryrefslogtreecommitdiff
path: root/testing/Makefile.inc
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-08-30 07:53:51 -0400
committerirungentoo <irungentoo@gmail.com>2013-08-30 07:53:51 -0400
commit7441a234b7f6dae025819bc2717026d6462e151a (patch)
tree3b5f42b61e14b6f54687adaf182248337dc93638 /testing/Makefile.inc
parentb37a016b6be8d6c43c368bb566c2c23962a6e571 (diff)
parenteb33796e58cfca4fa26b459ad5a9d013f1df4c42 (diff)
Merge branch 'udp_connections' of https://github.com/vx-k/ProjectTox-Core into vx-k-udp_connections
Diffstat (limited to 'testing/Makefile.inc')
-rw-r--r--testing/Makefile.inc12
1 files changed, 3 insertions, 9 deletions
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index bd499ab6..99c203c8 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -2,9 +2,7 @@ if BUILD_NTOX
2 2
3bin_PROGRAMS += nTox 3bin_PROGRAMS += nTox
4 4
5nTox_SOURCES = $(top_srcdir)/testing/misc_tools.h \ 5nTox_SOURCES = $(top_srcdir)/testing/nTox.h \
6 $(top_srcdir)/testing/misc_tools.c \
7 $(top_srcdir)/testing/nTox.h \
8 $(top_srcdir)/testing/nTox.c 6 $(top_srcdir)/testing/nTox.c
9 7
10nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \ 8nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \
@@ -24,9 +22,7 @@ noinst_PROGRAMS += DHT_test \
24 Messenger_test \ 22 Messenger_test \
25 crypto_speed_test 23 crypto_speed_test
26 24
27DHT_test_SOURCES = $(top_srcdir)/testing/DHT_test.c \ 25DHT_test_SOURCES = $(top_srcdir)/testing/DHT_test.c
28 $(top_srcdir)/testing/misc_tools.h \
29 $(top_srcdir)/testing/misc_tools.c
30 26
31DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS) 27DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS)
32 28
@@ -63,9 +59,7 @@ Lossless_UDP_testserver_LDADD = \
63 59
64 60
65Messenger_test_SOURCES = \ 61Messenger_test_SOURCES = \
66 $(top_srcdir)/testing/Messenger_test.c \ 62 $(top_srcdir)/testing/Messenger_test.c
67 $(top_srcdir)/testing/misc_tools.h \
68 $(top_srcdir)/testing/misc_tools.c
69 63
70Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) 64Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS)
71 65