From 8a4ae7c18166b55819a63328a4d65a68eae57f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Mon, 25 Mar 2013 10:22:52 +0100 Subject: [PATCH] Don't include asm objects twice in shared libhogweed. --- ChangeLog | 5 +++++ Makefile.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ad2a6a98..7249a87c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-03-25 Niels Möller <nisse@lysator.liu.se> + + * Makefile.in (hogweed_PURE_OBJS): Don't include OPT_ASM_SOURCES + twice. + 2013-03-15 Niels Möller <nisse@lysator.liu.se> * armv7/sha3-permute.asm: New file. 4.5 time speedup. diff --git a/Makefile.in b/Makefile.in index 1ec807be..2db76c51 100644 --- a/Makefile.in +++ b/Makefile.in @@ -180,7 +180,7 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(LIBOBJS) nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJEXT)=.p$(OBJEXT)) hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_SOURCES:.asm=.$(OBJEXT)) -hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT)) $(OPT_ASM_SOURCES:.asm=.p$(OBJEXT)) +hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT)) libnettle.a: $(nettle_OBJS) -rm -f $@ -- GitLab