From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 18 Sep 2019 18:47:47 +0000 (+0100)
Subject: progs/Makefile.am: Don't link `pixie' against the main `libcatacomb.la'.
X-Git-Tag: 2.5.0~2
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/dc467b41beb8451bab0118027019378191e86e7a

progs/Makefile.am: Don't link `pixie' against the main `libcatacomb.la'.

It doesn't actually do any cryptography.  Instead, Just pick out the
`base' and `key' libraries which contain its (very light) requirements.

This is the conclusion I reached following an Android ARM64 build
failure caused by lack of maths functions.
---

diff --git a/progs/Makefile.am b/progs/Makefile.am
index 5f4e570c..6de619f6 100644
--- a/progs/Makefile.am
+++ b/progs/Makefile.am
@@ -99,7 +99,9 @@ bin_PROGRAMS		+= perftest
 ## Remember passphrases for limited periods of time.
 bin_PROGRAMS		+= pixie
 pixie_SOURCES		 = pixie.c
-pixie_LDADD		 = $(UTILS_LIBS) $(PIXIE_LIBS) $(LOGLIBS)
+pixie_LDADD		 = $(top_builddir)/base/libbase.la
+pixie_LDADD		+= $(top_builddir)/key/libkey.la
+pixie_LDADD		+= $(mLib_LIBS) $(PIXIE_LIBS) $(LOGLIBS)
 dist_man_MANS		+= pixie.1
 EXTRA_DIST		+= xpixie