From e2a30a859d8097be4d7d7ff9a658a8a363a51270 Mon Sep 17 00:00:00 2001 From: xantares Date: Wed, 9 Oct 2013 19:22:23 +0200 Subject: [PATCH 1/2] Fixed libsodium.def dependency --- src/libsodium/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index db477ea6..3cbb376e 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -222,7 +222,8 @@ if HAVE_LD_OUTPUT_DEF libsodium_la_LDFLAGS += -Wl,--output-def,libsodium-$(DLL_VERSION).def defexecdir = $(bindir) defexec_DATA = libsodium-$(DLL_VERSION).def -DISTCLEANFILES = $(defexec_DATA) +CLEANFILES = $(defexec_DATA) +libsodium-$(DLL_VERSION).def: libsodium.la endif SUBDIRS = \ From 8d0942d5b1ce0b905c33ba661873fdf84951ee94 Mon Sep 17 00:00:00 2001 From: xantares Date: Wed, 9 Oct 2013 20:57:32 +0200 Subject: [PATCH 2/2] Do not include configured headers --- src/libsodium/include/Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libsodium/include/Makefile.am b/src/libsodium/include/Makefile.am index 50e787a6..4428c5dc 100644 --- a/src/libsodium/include/Makefile.am +++ b/src/libsodium/include/Makefile.am @@ -23,7 +23,6 @@ SODIUM_EXPORT = \ sodium/crypto_onetimeauth_poly1305_53.h \ sodium/crypto_onetimeauth_poly1305_donna.h \ sodium/crypto_scalarmult.h \ - sodium/crypto_scalarmult_curve25519.h \ sodium/crypto_secretbox.h \ sodium/crypto_secretbox_xsalsa20poly1305.h \ sodium/crypto_shorthash.h \ @@ -34,7 +33,6 @@ SODIUM_EXPORT = \ sodium/crypto_stream.h \ sodium/crypto_stream_aes128ctr.h \ sodium/crypto_stream_aes256estream.h \ - sodium/crypto_stream_salsa20.h \ sodium/crypto_stream_salsa2012.h \ sodium/crypto_stream_salsa208.h \ sodium/crypto_stream_xsalsa20.h \ @@ -50,8 +48,7 @@ SODIUM_EXPORT = \ sodium/randombytes.h \ sodium/randombytes_salsa20_random.h \ sodium/randombytes_sysrandom.h \ - sodium/utils.h \ - sodium/version.h + sodium/utils.h EXTRA_SRC = $(SODIUM_EXPORT) \ sodium/crypto_scalarmult_curve25519.h.in \