Don't include asm objects twice in shared libhogweed.

8a4ae7c1 · Niels Möller · 6de2999b · 8a4ae7c1 · 8a4ae7c1
Commit 8a4ae7c1 authored Mar 25, 2013 by Niels Möller
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

ChangeLog ChangeLog +5 -0

Makefile.in Makefile.in +1 -1

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+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.

--- 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 $@