cryb.to/cryb-to
1
0
Fork 0
mirror of https://github.com/cryb-to/cryb-to.git synced 2024-11-28 00:25:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix typo in libcryb-rand's Makefile and ensure that it is built before libcryb-oath, which uses it.

Browse source
This commit is contained in:
Dag-Erling Smørgrav 2016-11-21 13:46:49 +01:00
parent 071e9e7e32
commit 4cad790446
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -236,7 +236,7 @@ AM_CONDITIONAL([CRYB_MPI], [test x"$enable_cryb_digest" = x"yes"])
# OATH # OATH
elements="$elements 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_ARG_ENABLE([cryb-oath],
AC_HELP_STRING([--enable-cryb-oath], AC_HELP_STRING([--enable-cryb-oath],
[build the OATH library]), [build the OATH library]),

8
lib/Makefile.am
View file

@ -32,14 +32,14 @@ if CRYB_MPI
SUBDIRS += mpi SUBDIRS += mpi
endif CRYB_MPI endif CRYB_MPI
if CRYB_OATH
SUBDIRS += oath
endif CRYB_OATH
if CRYB_RAND if CRYB_RAND
SUBDIRS += rand SUBDIRS += rand
endif CRYB_RAND endif CRYB_RAND
if CRYB_OATH
SUBDIRS += oath
endif CRYB_OATH
if CRYB_TEST if CRYB_TEST
SUBDIRS += test SUBDIRS += test
endif CRYB_TEST endif CRYB_TEST

1
lib/oath/Makefile.am
View file

@ -19,4 +19,5 @@ libcryb_oath_la_LIBADD = \
$(top_builddir)/lib/digest/libcryb-digest.la \ $(top_builddir)/lib/digest/libcryb-digest.la \
$(top_builddir)/lib/enc/libcryb-enc.la \ $(top_builddir)/lib/enc/libcryb-enc.la \
$(top_builddir)/lib/mac/libcryb-mac.la \ $(top_builddir)/lib/mac/libcryb-mac.la \
$(top_builddir)/lib/rand/libcryb-rand.la \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la

2
lib/rand/Makefile.am
View file

@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
lib_LTLIBRARIES = libcryb-rand.la lib_LTLIBRARIES = libcryb-rand.la
libcryb_rand_la_SOURCES = \ libcryb_rand_la_SOURCES = \
cryb_rand_bytes.c cryb_rand_bytes.c \
\ \
cryb_rand.c cryb_rand.c