Fixes.

Fixed bug from merged PR.

Don't build useless files when building with libsodium.

2 files changed, 8 insertions, 6 deletions

diff --git a/toxencryptsave/Makefile.inc b/toxencryptsave/Makefile.inc
index 1155e954..20c8b1b3 100644
--- a/toxencryptsave/Makefile.inc
+++ b/toxencryptsave/Makefile.inc
@@ -5,7 +5,12 @@ libtoxencryptsave_la_include_HEADERS = \
 
 libtoxencryptsave_la_includedir = $(includedir)/tox
 
-libtoxencryptsave_la_SOURCES = ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h \
+libtoxencryptsave_la_SOURCES = ../toxencryptsave/toxencryptsave.h \
+                        ../toxencryptsave/toxencryptsave.c
+
+
+if WITH_NACL
+libtoxencryptsave_la_SOURCES += ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h \
                         ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt.h \
                         ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.c \
                         ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c \
@@ -19,10 +24,8 @@ libtoxencryptsave_la_SOURCES = ../toxencryptsave/crypto_pwhash_scryptsalsa208sha
                         ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sysendian.h \
                         ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.h \
                         ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c \
-                        ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c \
-                        ../toxencryptsave/toxencryptsave.h \
-                        ../toxencryptsave/toxencryptsave.c
-                        
+                        ../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
+endif
 
 libtoxencryptsave_la_CFLAGS =   -I$(top_srcdir) \
                         -I$(top_srcdir)/toxcore \
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c
index e6150ce2..5c40f639 100644
--- a/toxencryptsave/toxencryptsave.c
+++ b/toxencryptsave/toxencryptsave.c
@@ -32,7 +32,6 @@
 
 #ifdef VANILLA_NACL
 #include "crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h"
-#include "crypto_pwhash_scryptsalsa208sha256/utils.h" /* sodium_memzero */
 #include <crypto_hash_sha256.h>
 #endif