summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--testing/Makefile.inc17
2 files changed, 10 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index dba051c7..62bb91bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -587,6 +587,7 @@ AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
587AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes") 587AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes")
588AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes") 588AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes")
589AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes") 589AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes")
590AM_CONDITIONAL(WIN32, test "x$WIN32" = "xyes")
590 591
591AC_CONFIG_FILES([Makefile 592AC_CONFIG_FILES([Makefile
592 build/Makefile 593 build/Makefile
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index de3995be..31c84678 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -25,8 +25,7 @@ noinst_PROGRAMS += DHT_test \
25 Lossless_UDP_testclient \ 25 Lossless_UDP_testclient \
26 Lossless_UDP_testserver \ 26 Lossless_UDP_testserver \
27 Messenger_test \ 27 Messenger_test \
28 crypto_speed_test \ 28 crypto_speed_test
29 tox_sync
30 29
31DHT_test_SOURCES = ../testing/DHT_test.c 30DHT_test_SOURCES = ../testing/DHT_test.c
32 31
@@ -102,20 +101,22 @@ crypto_speed_test_LDADD = \
102 $(NACL_LIBS) \ 101 $(NACL_LIBS) \
103 $(WINSOCK2_LIBS) 102 $(WINSOCK2_LIBS)
104 103
105tox_sync_SOURCES = \ 104if !WIN32
106 ../testing/tox_sync.c
107 105
108tox_sync_CFLAGS = \ 106noinst_PROGRAMS += tox_sync
109 $(LIBSODIUM_CFLAGS) \ 107
108tox_sync_SOURCES = ../testing/tox_sync.c
109
110tox_sync_CFLAGS = $(LIBSODIUM_CFLAGS) \
110 $(NACL_CFLAGS) 111 $(NACL_CFLAGS)
111 112
112tox_sync_LDADD = \ 113tox_sync_LDADD = $(LIBSODIUM_LDFLAGS) \
113 $(LIBSODIUM_LDFLAGS) \
114 $(NACL_LDFLAGS) \ 114 $(NACL_LDFLAGS) \
115 libtoxcore.la \ 115 libtoxcore.la \
116 $(LIBSODIUM_LIBS) \ 116 $(LIBSODIUM_LIBS) \
117 $(NACL_LIBS) \ 117 $(NACL_LIBS) \
118 $(WINSOCK2_LIBS) 118 $(WINSOCK2_LIBS)
119endif
119 120
120EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c 121EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c
121 122