Merge commit 'b2ae9530a405e02a50476c04fc7196c5e9863ad6'

external/toxcore/c-toxcore/toxencryptsave/Makefile.inc

@@ -5,7 +5,6 @@ libtoxencryptsave_la_include_HEADERS = \
 
 libtoxencryptsave_la_includedir = $(includedir)/tox
 
-if !WITH_NACL
 libtoxencryptsave_la_SOURCES = ../toxencryptsave/toxencryptsave.h \
                         ../toxencryptsave/toxencryptsave.c \
                         ../toxencryptsave/defines.h
@@ -13,20 +12,16 @@ libtoxencryptsave_la_SOURCES = ../toxencryptsave/toxencryptsave.h \
 libtoxencryptsave_la_CFLAGS =   -I$(top_srcdir) \
                         -I$(top_srcdir)/toxcore \
                         $(LIBSODIUM_CFLAGS) \
-                        $(NACL_CFLAGS) \
                         $(PTHREAD_CFLAGS)
 
 libtoxencryptsave_la_LDFLAGS =  $(LT_LDFLAGS) \
                         $(EXTRA_LT_LDFLAGS) \
                         $(LIBSODIUM_LDFLAGS) \
-                        $(NACL_LDFLAGS) \
                         $(MATH_LDFLAGS) \
                         $(RT_LIBS) \
                         $(WINSOCK2_LIBS)
 
 libtoxencryptsave_la_LIBADD =   $(LIBSODIUM_LIBS) \
-                        $(NACL_OBJECTS) \
-                        $(NACL_LIBS) \
                         $(PTHREAD_LIBS) \
                         libtoxcore.la
 
@@ -35,4 +30,3 @@ if SET_SO_VERSION
 EXTRA_libtoxencryptsave_la_DEPENDENCIES = ../so.version
 
 endif
-endif