From 61775cc84d96ad71400f2f97976794af2072700b Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 20 Jan 2013 17:23:37 -0800
Subject: [PATCH] Add missing dependencies

---
 src/libsodium/Makefile.am |  3 ++
 test/Makefile.am          | 65 ++++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 73158820..31e3aad6 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -76,6 +76,9 @@ libsodium_la_SOURCES = \
 	crypto_sign/ed25519/ref/sc25519_ed25519.c \
 	version.c
 
+EXTRA_DIST = \
+	crypto_sign/ed25519/ref/ge25519_base.data
+
 libsodium_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-export-dynamic \
diff --git a/test/Makefile.am b/test/Makefile.am
index 168129f0..c8c2bade 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,7 @@
 
+EXTRA_DIST = \
+	cmptest.h
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libsodium/include \
 	-I$(top_srcdir)/src/libsodium/include/sodium
@@ -43,100 +46,100 @@ TESTS = $(TESTS_TARGETS)
 
 TESTS_LDADD = $(top_srcdir)/src/libsodium/libsodium.la
 
-auth_SOURCE               = auth.c
+auth_SOURCE               = cmptest.h auth.c
 auth_LDADD                = $(TESTS_LDADD)
 
-auth2_SOURCE              = auth2.c
+auth2_SOURCE              = cmptest.h auth2.c
 auth2_LDADD               = $(TESTS_LDADD)
 
-auth3_SOURCE              = auth3.c
+auth3_SOURCE              = cmptest.h auth3.c
 auth3_LDADD               = $(TESTS_LDADD)
 
-auth5_SOURCE              = auth5.c windows/windows-quirks.h
+auth5_SOURCE              = cmptest.h auth5.c windows/windows-quirks.h
 auth5_LDADD               = $(TESTS_LDADD)
 
-box_SOURCE                = box.c
+box_SOURCE                = cmptest.h box.c
 box_LDADD                 = $(TESTS_LDADD)
 
-box2_SOURCE               = box2.c
+box2_SOURCE               = cmptest.h box2.c
 box2_LDADD                = $(TESTS_LDADD)
 
-box7_SOURCE               = box7.c
+box7_SOURCE               = cmptest.h box7.c
 box7_LDADD                = $(TESTS_LDADD)
 
-box8_SOURCE               = box8.c
+box8_SOURCE               = cmptest.h box8.c
 box8_LDADD                = $(TESTS_LDADD)
 
-core1_SOURCE              = core1.c
+core1_SOURCE              = cmptest.h core1.c
 core1_LDADD               = $(TESTS_LDADD)
 
-core2_SOURCE              = core2.c
+core2_SOURCE              = cmptest.h core2.c
 core2_LDADD               = $(TESTS_LDADD)
 
-core3_SOURCE              = core3.c
+core3_SOURCE              = cmptest.h core3.c
 core3_LDADD               = $(TESTS_LDADD)
 
-core4_SOURCE              = core4.c
+core4_SOURCE              = cmptest.h core4.c
 core4_LDADD               = $(TESTS_LDADD)
 
-core5_SOURCE              = core5.c
+core5_SOURCE              = cmptest.h core5.c
 core5_LDADD               = $(TESTS_LDADD)
 
-core6_SOURCE              = core6.c
+core6_SOURCE              = cmptest.h core6.c
 core6_LDADD               = $(TESTS_LDADD)
 
-hash_SOURCE               = hash.c
+hash_SOURCE               = cmptest.h hash.c
 hash_LDADD                = $(TESTS_LDADD)
 
-hash3_SOURCE              = hash3.c
+hash3_SOURCE              = cmptest.h hash3.c
 hash3_LDADD               = $(TESTS_LDADD)
 
-onetimeauth_SOURCE        = onetimeauth.c
+onetimeauth_SOURCE        = cmptest.h onetimeauth.c
 onetimeauth_LDADD         = $(TESTS_LDADD)
 
-onetimeauth2_SOURCE       = onetimeauth2.c
+onetimeauth2_SOURCE       = cmptest.h onetimeauth2.c
 onetimeauth2_LDADD        = $(TESTS_LDADD)
 
-onetimeauth7_SOURCE       = onetimeauth7.c
+onetimeauth7_SOURCE       = cmptest.h onetimeauth7.c
 onetimeauth7_LDADD        = $(TESTS_LDADD)
 
 randombytes_SOURCE        = randombytes.c
 randombytes_LDADD         = $(TESTS_LDADD)
 
-scalarmult_SOURCE         = scalarmult.c
+scalarmult_SOURCE         = cmptest.h scalarmult.c
 scalarmult_LDADD          = $(TESTS_LDADD)
 
-scalarmult2_SOURCE        = scalarmult2.c
+scalarmult2_SOURCE        = cmptest.h scalarmult2.c
 scalarmult2_LDADD         = $(TESTS_LDADD)
 
-scalarmult5_SOURCE        = scalarmult5.c
+scalarmult5_SOURCE        = cmptest.h scalarmult5.c
 scalarmult5_LDADD         = $(TESTS_LDADD)
 
-scalarmult6_SOURCE        = scalarmult6.c
+scalarmult6_SOURCE        = cmptest.h scalarmult6.c
 scalarmult6_LDADD         = $(TESTS_LDADD)
 
-secretbox_SOURCE          = secretbox.c
+secretbox_SOURCE          = cmptest.h secretbox.c
 secretbox_LDADD           = $(TESTS_LDADD)
 
-secretbox2_SOURCE         = secretbox2.c
+secretbox2_SOURCE         = cmptest.h secretbox2.c
 secretbox2_LDADD          = $(TESTS_LDADD)
 
-secretbox7_SOURCE         = secretbox7.c
+secretbox7_SOURCE         = cmptest.h secretbox7.c
 secretbox7_LDADD          = $(TESTS_LDADD)
 
-secretbox8_SOURCE         = secretbox8.c
+secretbox8_SOURCE         = cmptest.h secretbox8.c
 secretbox8_LDADD          = $(TESTS_LDADD)
 
-stream_SOURCE             = stream.c
+stream_SOURCE             = cmptest.h stream.c
 stream_LDADD              = $(TESTS_LDADD)
 
-stream2_SOURCE            = stream2.c
+stream2_SOURCE            = cmptest.h stream2.c
 stream2_LDADD             = $(TESTS_LDADD)
 
-stream3_SOURCE            = stream3.c
+stream3_SOURCE            = cmptest.h stream3.c
 stream3_LDADD             = $(TESTS_LDADD)
 
-stream4_SOURCE            = stream4.c
+stream4_SOURCE            = cmptest.h stream4.c
 stream4_LDADD             = $(TESTS_LDADD)
 
 verify: check