Fix NaCl builds for *BSD

From what I see there is a difference between *BSD and Linux when
linking vs. toxcore which has been bulit vs. the NaCl library:

on Linux it only links if NaCl's object files (i.e. randombytes.o) is
present in the linker options, however on *BSD systems this will cause a
linking error, see:
https://github.com/Tox/toxic/issues/31#issuecomment-38224441

This commit makes sure that we do not add the NaCl object files to our
pkg-config settings on *BSD, but do add them on Linux.

1 files changed, 6 insertions, 0 deletions

diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index 31c84678..812a5be1 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -36,6 +36,7 @@ DHT_test_LDADD =        $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
@@ -52,6 +53,7 @@ Lossless_UDP_testclient_LDADD = \
                         $(NACL_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
@@ -68,6 +70,7 @@ Lossless_UDP_testserver_LDADD = \
                         $(NACL_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
@@ -82,6 +85,7 @@ Messenger_test_LDADD =  $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
@@ -98,6 +102,7 @@ crypto_speed_test_LDADD = \
                         $(NACL_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
@@ -114,6 +119,7 @@ tox_sync_LDADD =        $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 endif