X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/1aaccf40b93719fd3df7cc89e023b9bb48b358b6..HEAD:/base/Makefile.am

diff --git a/base/Makefile.am b/base/Makefile.am
index c9560ca2..f4c99732 100644
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -29,6 +29,8 @@ include $(top_srcdir)/vars.am
 noinst_LTLIBRARIES	 = libbase.la
 libbase_la_SOURCES	 =
 
+TEST_LIBS		 = libbase.la
+
 ###--------------------------------------------------------------------------
 ### Component files.
 
@@ -40,9 +42,18 @@ libbase_la_SOURCES	+= arena.c
 pkginclude_HEADERS	+= ct.h
 libbase_la_SOURCES	+= ct.c ct-test.c
 
+## Bit permutations.
+pkginclude_HEADERS	+= permute.h
+
 ## CPU-specific dispatch.
 pkginclude_HEADERS	+= dispatch.h
 libbase_la_SOURCES	+= dispatch.c
+if CPUFAM_X86
+libbase_la_SOURCES	+= dispatch-x86ish.S
+endif
+if CPUFAM_AMD64
+libbase_la_SOURCES	+= dispatch-x86ish.S
+endif
 
 ## Acceptable key-size descriptions.
 pkginclude_HEADERS	+= keysz.h
@@ -55,7 +66,29 @@ libbase_la_SOURCES	+= lmem.c
 ## Clearing secrets from memory.
 pkginclude_HEADERS	+= paranoia.h
 
+## Reservoir handling.
+pkginclude_HEADERS	+= rsvr.h
+libbase_la_SOURCES	+= rsvr.c
+TESTS			+= rsvr.t$(EXEEXT)
+EXTRA_DIST		+= t/rsvr
+
 ## Base definitions for assembler source.
 EXTRA_DIST		+= asm-common.h
 
+if ASM_DEBUG
+libbase_la_SOURCES	+= regdump.c regdump.h
+if CPUFAM_X86
+libbase_la_SOURCES	+= regdump-x86ish.S
+endif
+if CPUFAM_AMD64
+libbase_la_SOURCES	+= regdump-x86ish.S
+endif
+if CPUFAM_ARMEL
+libbase_la_SOURCES	+= regdump-arm.S
+endif
+if CPUFAM_ARM64
+libbase_la_SOURCES	+= regdump-arm64.S
+endif
+endif
+
 ###----- That's all, folks --------------------------------------------------