From 87af79c629336e8ed2ca7a49520236e75fa3924b Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 21 Jan 2013 11:32:34 -0800
Subject: [PATCH] Don't include randombyte - move it to a different library.

---
 README.markdown           |  2 +-
 src/libsodium/Makefile.am | 10 +++++++---
 test/Makefile.am          |  4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.markdown b/README.markdown
index 5b57152b..9516f0e1 100644
--- a/README.markdown
+++ b/README.markdown
@@ -36,7 +36,7 @@ Installation is trivial, and both compilation and testing can take
 advantage of multiple CPU cores:
 
     ./configure
-    make check && make install
+    make && make check && make install
 
 ## Comparison with vanilla NaCl
 
diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index a47e5135..7dab605d 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -2,9 +2,14 @@
 lib_LTLIBRARIES = \
 	libsodium.la
 
-libsodium_la_SOURCES = \
+noinst_LTLIBRARIES = \
+	libsodium-randombytes.la
+
+libsodium_randombytes_la_SOURCES = \
 	randombytes/devurandom.c \
-	randombytes/devurandom.h \
+	randombytes/devurandom.h
+
+libsodium_la_SOURCES = \
 	crypto_core/hsalsa20/ref2/core_hsalsa20.c \
 	crypto_core/hsalsa20/ref2/crypto_core.h \
 	crypto_core/salsa20/ref/core_salsa20.c \
@@ -82,7 +87,6 @@ EXTRA_DIST = \
 libsodium_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-export-dynamic \
-	-no-undefined \
 	-version-info $(SODIUM_LIBRARY_VERSION)
 
 libsodium_la_CPPFLAGS = \
diff --git a/test/Makefile.am b/test/Makefile.am
index 724f20ec..24383986 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -77,7 +77,9 @@ check_PROGRAMS = $(TESTS_TARGETS)
 
 TESTS = $(TESTS_TARGETS)
 
-TESTS_LDADD = ${top_builddir}/src/libsodium/libsodium.la
+TESTS_LDADD = \
+	${top_builddir}/src/libsodium/libsodium.la \
+	${top_builddir}/src/libsodium/libsodium-randombytes.la
 
 auth_SOURCE               = cmptest.h auth.c
 auth_LDADD                = $(TESTS_LDADD)