From 4c6e162c52a3d519124df7b3cddb3859d566ef0e Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 21 Jan 2013 12:46:40 -0800 Subject: [PATCH] Remove libsodium-randombytes. --- src/libsodium/Makefile.am | 11 ++++------- test/Makefile.am | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am index 66dc703e..de51ba83 100644 --- a/src/libsodium/Makefile.am +++ b/src/libsodium/Makefile.am @@ -1,12 +1,6 @@ lib_LTLIBRARIES = \ - libsodium.la \ - libsodium-randombytes.la - -libsodium_randombytes_la_SOURCES = \ - randombytes/randombytes.c \ - randombytes/salsa20_random.c \ - randombytes/salsa20_random.h + libsodium.la libsodium_la_SOURCES = \ crypto_core/hsalsa20/ref2/core_hsalsa20.c \ @@ -78,6 +72,9 @@ libsodium_la_SOURCES = \ crypto_sign/ed25519/ref/ge25519_ed25519.c \ crypto_sign/ed25519/ref/sc25519.h \ crypto_sign/ed25519/ref/sc25519_ed25519.c \ + randombytes/randombytes.c \ + randombytes/salsa20_random.c \ + randombytes/salsa20_random.h \ version.c EXTRA_DIST = \ diff --git a/test/Makefile.am b/test/Makefile.am index 24383986..00c0f9ae 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -78,8 +78,7 @@ check_PROGRAMS = $(TESTS_TARGETS) TESTS = $(TESTS_TARGETS) TESTS_LDADD = \ - ${top_builddir}/src/libsodium/libsodium.la \ - ${top_builddir}/src/libsodium/libsodium-randombytes.la + ${top_builddir}/src/libsodium/libsodium.la auth_SOURCE = cmptest.h auth.c auth_LDADD = $(TESTS_LDADD)