diff options
author | irungentoo <irungentoo@gmail.com> | 2013-09-07 13:28:33 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-09-07 13:28:33 -0400 |
commit | 220fb72121f6013fa5421de3367dbecd8cca1aed (patch) | |
tree | 98f8582bed829f0ce38b2337da9a0244ce5cba06 /testing/Makefile.inc | |
parent | bdf31fc6b55646fd798f5d39aeb5751f4a5319e7 (diff) | |
parent | 4444494b65265ea74aec9361c4f188f7a3b87f32 (diff) |
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
Diffstat (limited to 'testing/Makefile.inc')
-rw-r--r-- | testing/Makefile.inc | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/testing/Makefile.inc b/testing/Makefile.inc index b63e715a..ee68e289 100644 --- a/testing/Makefile.inc +++ b/testing/Makefile.inc | |||
@@ -6,11 +6,14 @@ nTox_SOURCES = ../testing/nTox.h \ | |||
6 | ../testing/nTox.c | 6 | ../testing/nTox.c |
7 | 7 | ||
8 | nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \ | 8 | nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \ |
9 | $(NACL_CFLAGS) \ | ||
9 | $(NCURSES_CFLAGS) | 10 | $(NCURSES_CFLAGS) |
10 | 11 | ||
11 | nTox_LDADD = $(LIBSODIUM_LDFLAGS) \ | 12 | nTox_LDADD = $(LIBSODIUM_LDFLAGS) \ |
13 | $(NAC_LDFLAGS) \ | ||
12 | libtoxcore.la \ | 14 | libtoxcore.la \ |
13 | $(LIBSODIUM_LIBS) \ | 15 | $(LIBSODIUM_LIBS) \ |
16 | $(NACL_LIBS) \ | ||
14 | $(NCURSES_LIBS) \ | 17 | $(NCURSES_LIBS) \ |
15 | $(WINSOCK2_LIBS) | 18 | $(WINSOCK2_LIBS) |
16 | endif | 19 | endif |
@@ -24,11 +27,14 @@ noinst_PROGRAMS += DHT_test \ | |||
24 | 27 | ||
25 | DHT_test_SOURCES = ../testing/DHT_test.c | 28 | DHT_test_SOURCES = ../testing/DHT_test.c |
26 | 29 | ||
27 | DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS) | 30 | DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS) \ |
31 | $(NACL_CFLAGS) | ||
28 | 32 | ||
29 | DHT_test_LDADD = $(LIBSODIUM_LDFLAGS) \ | 33 | DHT_test_LDADD = $(LIBSODIUM_LDFLAGS) \ |
34 | $(NACL_LDFLAGS) \ | ||
30 | libtoxcore.la \ | 35 | libtoxcore.la \ |
31 | $(LIBSODIUM_LIBS) \ | 36 | $(LIBSODIUM_LIBS) \ |
37 | $(NACL_LIBS) \ | ||
32 | $(WINSOCK2_LIBS) | 38 | $(WINSOCK2_LIBS) |
33 | 39 | ||
34 | 40 | ||
@@ -36,12 +42,15 @@ Lossless_UDP_testclient_SOURCES = \ | |||
36 | ../testing/Lossless_UDP_testclient.c | 42 | ../testing/Lossless_UDP_testclient.c |
37 | 43 | ||
38 | Lossless_UDP_testclient_CFLAGS = \ | 44 | Lossless_UDP_testclient_CFLAGS = \ |
39 | $(LIBSODIUM_CFLAGS) | 45 | $(LIBSODIUM_CFLAGS) \ |
46 | $(NACL_CFLAGS) | ||
40 | 47 | ||
41 | Lossless_UDP_testclient_LDADD = \ | 48 | Lossless_UDP_testclient_LDADD = \ |
42 | $(LIBSODIUM_LDFLAGS) \ | 49 | $(LIBSODIUM_LDFLAGS) \ |
50 | $(NACL_LDFLAGS) \ | ||
43 | libtoxcore.la \ | 51 | libtoxcore.la \ |
44 | $(LIBSODIUM_LIBS) \ | 52 | $(LIBSODIUM_LIBS) \ |
53 | $(NACL_LIBS) \ | ||
45 | $(WINSOCK2_LIBS) | 54 | $(WINSOCK2_LIBS) |
46 | 55 | ||
47 | 56 | ||
@@ -49,23 +58,29 @@ Lossless_UDP_testserver_SOURCES = \ | |||
49 | ../testing/Lossless_UDP_testserver.c | 58 | ../testing/Lossless_UDP_testserver.c |
50 | 59 | ||
51 | Lossless_UDP_testserver_CFLAGS = \ | 60 | Lossless_UDP_testserver_CFLAGS = \ |
52 | $(LIBSODIUM_CFLAGS) | 61 | $(LIBSODIUM_CFLAGS) \ |
62 | $(NACL_CFLAGS) | ||
53 | 63 | ||
54 | Lossless_UDP_testserver_LDADD = \ | 64 | Lossless_UDP_testserver_LDADD = \ |
55 | $(LIBSODIUM_LDFLAGS) \ | 65 | $(LIBSODIUM_LDFLAGS) \ |
66 | $(NACL_LDFLAGS) \ | ||
56 | libtoxcore.la \ | 67 | libtoxcore.la \ |
57 | $(LIBSODIUM_LIBS) \ | 68 | $(LIBSODIUM_LIBS) \ |
69 | $(NACL_LIBS) \ | ||
58 | $(WINSOCK2_LIBS) | 70 | $(WINSOCK2_LIBS) |
59 | 71 | ||
60 | 72 | ||
61 | Messenger_test_SOURCES = \ | 73 | Messenger_test_SOURCES = \ |
62 | ../testing/Messenger_test.c | 74 | ../testing/Messenger_test.c |
63 | 75 | ||
64 | Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) | 76 | Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) \ |
77 | $(NACL_CFLAGS) | ||
65 | 78 | ||
66 | Messenger_test_LDADD = $(LIBSODIUM_LDFLAGS) \ | 79 | Messenger_test_LDADD = $(LIBSODIUM_LDFLAGS) \ |
80 | $(NACL_LDFLAGS) \ | ||
67 | libtoxcore.la \ | 81 | libtoxcore.la \ |
68 | $(LIBSODIUM_LIBS) \ | 82 | $(LIBSODIUM_LIBS) \ |
83 | $(NACL_LIBS) \ | ||
69 | $(WINSOCK2_LIBS) | 84 | $(WINSOCK2_LIBS) |
70 | 85 | ||
71 | 86 | ||
@@ -73,12 +88,15 @@ crypto_speed_test_SOURCES = \ | |||
73 | ../testing/crypto_speed_test.c | 88 | ../testing/crypto_speed_test.c |
74 | 89 | ||
75 | crypto_speed_test_CFLAGS = \ | 90 | crypto_speed_test_CFLAGS = \ |
76 | $(LIBSODIUM_CFLAGS) | 91 | $(LIBSODIUM_CFLAGS) \ |
92 | $(NACL_CFLAGS) | ||
77 | 93 | ||
78 | crypto_speed_test_LDADD = \ | 94 | crypto_speed_test_LDADD = \ |
79 | $(LIBSODIUM_LDFLAGS) \ | 95 | $(LIBSODIUM_LDFLAGS) \ |
96 | $(NACL_LDFLAGS) \ | ||
80 | libtoxcore.la \ | 97 | libtoxcore.la \ |
81 | $(LIBSODIUM_LIBS) \ | 98 | $(LIBSODIUM_LIBS) \ |
99 | $(NACL_LIBS) \ | ||
82 | $(WINSOCK2_LIBS) | 100 | $(WINSOCK2_LIBS) |
83 | 101 | ||
84 | EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c | 102 | EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c |