From 4cad790446bf72082164c7c4a81b9c76670d80fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 21 Nov 2016 13:46:49 +0100 Subject: [PATCH] Fix typo in libcryb-rand's Makefile and ensure that it is built before libcryb-oath, which uses it. --- configure.ac | 2 +- lib/Makefile.am | 8 ++++---- lib/oath/Makefile.am | 1 + lib/rand/Makefile.am | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index a83ca1d..57c189d 100644 --- a/configure.ac +++ b/configure.ac @@ -236,7 +236,7 @@ AM_CONDITIONAL([CRYB_MPI], [test x"$enable_cryb_digest" = x"yes"]) # OATH elements="$elements oath" -requires="$requires oath:core oath:digest oath:mac oath:enc" +requires="$requires oath:core oath:digest oath:enc oath:mac oath:rand" AC_ARG_ENABLE([cryb-oath], AC_HELP_STRING([--enable-cryb-oath], [build the OATH library]), diff --git a/lib/Makefile.am b/lib/Makefile.am index 5f58eed..700f256 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -32,14 +32,14 @@ if CRYB_MPI SUBDIRS += mpi endif CRYB_MPI -if CRYB_OATH -SUBDIRS += oath -endif CRYB_OATH - if CRYB_RAND SUBDIRS += rand endif CRYB_RAND +if CRYB_OATH +SUBDIRS += oath +endif CRYB_OATH + if CRYB_TEST SUBDIRS += test endif CRYB_TEST diff --git a/lib/oath/Makefile.am b/lib/oath/Makefile.am index c2c6123..667766c 100644 --- a/lib/oath/Makefile.am +++ b/lib/oath/Makefile.am @@ -19,4 +19,5 @@ libcryb_oath_la_LIBADD = \ $(top_builddir)/lib/digest/libcryb-digest.la \ $(top_builddir)/lib/enc/libcryb-enc.la \ $(top_builddir)/lib/mac/libcryb-mac.la \ + $(top_builddir)/lib/rand/libcryb-rand.la \ $(top_builddir)/lib/core/libcryb-core.la diff --git a/lib/rand/Makefile.am b/lib/rand/Makefile.am index d2cc077..982f99e 100644 --- a/lib/rand/Makefile.am +++ b/lib/rand/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libcryb-rand.la libcryb_rand_la_SOURCES = \ - cryb_rand_bytes.c + cryb_rand_bytes.c \ \ cryb_rand.c