Commit 6223175f authored by Niels Möller's avatar Niels Möller

Include memxor unconditionally, not via LIBOBJS.

parent 76ce8536
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>
......
......@@ -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))
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment