From 6223175feb761f770109475f6f2880edea601529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Wed, 24 Apr 2013 22:28:47 +0200 Subject: [PATCH] Include memxor unconditionally, not via LIBOBJS. --- ChangeLog | 7 +++++++ Makefile.in | 5 ++--- configure.ac | 2 -- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6a216d6..d53197fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2013-04-24 Niels Möller <nisse@lysator.liu.se> + * Makefile.in (nettle_OBJS): Deleted $(LIBOBJS), and also deleted + LIBOBJS substitution. + (nettle_SOURCES): Added memxor.c, to include it in the library + unconditionally. + + * configure.ac: Deleted AC_REPLACE_FUNCS for memxor. + * Released nettle-2.7. 2013-04-23 Niels Möller <nisse@lysator.liu.se> diff --git a/Makefile.in b/Makefile.in index cbc001c7..2b4f3e5f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,8 +5,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ -LIBOBJS = @LIBOBJS@ - INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -84,6 +82,7 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \ knuth-lfib.c \ md2.c md2-meta.c md4.c md4-meta.c \ md5.c md5-compress.c md5-compat.c md5-meta.c \ + memxor.c \ gosthash94.c \ ripemd160.c ripemd160-compress.c ripemd160-meta.c \ salsa20-core-internal.c \ @@ -180,7 +179,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h .bootstrap run-tests \ nettle.texinfo nettle.info nettle.html nettle.pdf sha-example.c # Rules building static libraries -nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(LIBOBJS) +nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJEXT)=.p$(OBJEXT)) hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_SOURCES:.asm=.$(OBJEXT)) diff --git a/configure.ac b/configure.ac index 232aa9cb..7509ee62 100644 --- a/configure.ac +++ b/configure.ac @@ -606,9 +606,7 @@ AC_CHECK_HEADERS([openssl/blowfish.h openssl/des.h openssl/cast.h openssl/aes.h] LSH_FUNC_ALLOCA LSH_FUNC_STRERROR -# Needed by the supplied memcmp.c AC_C_BIGENDIAN -AC_REPLACE_FUNCS(memxor) LSH_GCC_ATTRIBUTES -- GitLab