From e092eee869ee4bb78974985321b55a3235c32b4d Mon Sep 17 00:00:00 2001 From: Jin^eLD Date: Thu, 5 Sep 2013 13:02:26 +0300 Subject: Allow to build vs nacl instead of libsodium By default libsodium is used. Only if --enable-nacl is specified, then nacl will be used instead of libsodium. Pass locations of nacl headers and libraries by using the following options: --with-nacl-headers=/home/me/somewhere/nacl-20110221/build/469/include/amd64/ --with-nacl-libs=/home/me/somewhere/nacl-20110221/build/469/lib/amd64/ --- testing/Makefile.inc | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'testing/Makefile.inc') 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 \ ../testing/nTox.c nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \ + $(NACL_CFLAGS) \ $(NCURSES_CFLAGS) nTox_LDADD = $(LIBSODIUM_LDFLAGS) \ + $(NAC_LDFLAGS) \ libtoxcore.la \ $(LIBSODIUM_LIBS) \ + $(NACL_LIBS) \ $(NCURSES_LIBS) \ $(WINSOCK2_LIBS) endif @@ -24,11 +27,14 @@ noinst_PROGRAMS += DHT_test \ DHT_test_SOURCES = ../testing/DHT_test.c -DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS) +DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS) \ + $(NACL_CFLAGS) DHT_test_LDADD = $(LIBSODIUM_LDFLAGS) \ + $(NACL_LDFLAGS) \ libtoxcore.la \ $(LIBSODIUM_LIBS) \ + $(NACL_LIBS) \ $(WINSOCK2_LIBS) @@ -36,12 +42,15 @@ Lossless_UDP_testclient_SOURCES = \ ../testing/Lossless_UDP_testclient.c Lossless_UDP_testclient_CFLAGS = \ - $(LIBSODIUM_CFLAGS) + $(LIBSODIUM_CFLAGS) \ + $(NACL_CFLAGS) Lossless_UDP_testclient_LDADD = \ $(LIBSODIUM_LDFLAGS) \ + $(NACL_LDFLAGS) \ libtoxcore.la \ $(LIBSODIUM_LIBS) \ + $(NACL_LIBS) \ $(WINSOCK2_LIBS) @@ -49,23 +58,29 @@ Lossless_UDP_testserver_SOURCES = \ ../testing/Lossless_UDP_testserver.c Lossless_UDP_testserver_CFLAGS = \ - $(LIBSODIUM_CFLAGS) + $(LIBSODIUM_CFLAGS) \ + $(NACL_CFLAGS) Lossless_UDP_testserver_LDADD = \ $(LIBSODIUM_LDFLAGS) \ + $(NACL_LDFLAGS) \ libtoxcore.la \ $(LIBSODIUM_LIBS) \ + $(NACL_LIBS) \ $(WINSOCK2_LIBS) Messenger_test_SOURCES = \ ../testing/Messenger_test.c -Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) +Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) \ + $(NACL_CFLAGS) Messenger_test_LDADD = $(LIBSODIUM_LDFLAGS) \ + $(NACL_LDFLAGS) \ libtoxcore.la \ $(LIBSODIUM_LIBS) \ + $(NACL_LIBS) \ $(WINSOCK2_LIBS) @@ -73,12 +88,15 @@ crypto_speed_test_SOURCES = \ ../testing/crypto_speed_test.c crypto_speed_test_CFLAGS = \ - $(LIBSODIUM_CFLAGS) + $(LIBSODIUM_CFLAGS) \ + $(NACL_CFLAGS) crypto_speed_test_LDADD = \ $(LIBSODIUM_LDFLAGS) \ + $(NACL_LDFLAGS) \ libtoxcore.la \ $(LIBSODIUM_LIBS) \ + $(NACL_LIBS) \ $(WINSOCK2_LIBS) EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c -- cgit v1.2.3