From 1f0c7e6bbdf6be6b9d1f544b35cdcb758270176e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Mon, 12 Jan 2015 17:01:31 +0100
Subject: [PATCH] Replace OPT_ASM_NETTLE_SOURCES by OPT_NETTLE_OBJS, and
similarly for hogweed.
---
ChangeLog | 9 +++++++++
Makefile.in | 8 ++++----
configure.ac | 16 ++++++++++------
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 98d7b4c8..f9de966e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-12 Niels Möller <nisse@lysator.liu.se>
+
+ * configure.ac (OPT_NETTLE_OBJS, OPT_HOGWEED_OBJS): Renamed
+ substituted variables, and list the object files rather than
+ source files.
+ (OPT_ASM_NETTLE_SOURCES, OPT_ASM_HOGWEED_SOURCES): ...Old names.
+ * Makefile.in (OPT_NETTLE_OBJS, OPT_HOGWEED_OBJS): Use new
+ variables.
+
2015-01-11 Niels Möller <nisse@lysator.liu.se>
* x86_64/aesni/aes-decrypt-internal.asm: New file.
diff --git a/Makefile.in b/Makefile.in
index 0d3c4246..6db6c349 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,8 +12,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
MKDIR_P = @MKDIR_P@
-OPT_ASM_NETTLE_SOURCES = @OPT_ASM_NETTLE_SOURCES@
-OPT_ASM_HOGWEED_SOURCES = @OPT_ASM_HOGWEED_SOURCES@
+OPT_NETTLE_OBJS = @OPT_NETTLE_OBJS@
+OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@
OPT_HOGWEED_SOURCES = @IF_MINI_GMP@ mini-gmp.c
@@ -222,9 +222,9 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h getopt_int.h \
nettle.texinfo nettle.info nettle.html nettle.pdf sha-example.c
# Rules building static libraries
-nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_NETTLE_SOURCES:.asm=.$(OBJEXT))
+nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(OPT_NETTLE_OBJS)
-hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_HOGWEED_SOURCES:.asm=.$(OBJEXT))
+hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_HOGWEED_OBJS)
libnettle.a: $(nettle_OBJS)
-rm -f $@
diff --git a/configure.ac b/configure.ac
index 63f59c65..80fdd79f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,8 +295,8 @@ if test "x$enable_public_key" = "xyes" ; then
ecc-25519-modp.asm ecc-256-redc.asm ecc-384-modp.asm ecc-521-modp.asm"
fi
-OPT_ASM_NETTLE_SOURCES=""
-OPT_ASM_HOGWEED_SOURCES=""
+OPT_NETTLE_OBJS=""
+OPT_HOGWEED_OBJS=""
asm_file_list=""
@@ -315,6 +315,8 @@ if test "x$enable_assembler" = xyes ; then
dnl Workaround for AC_CONFIG_LINKS, which complains if we use the
dnl same destination argument $tmp_f multiple times.
for tmp_n in $asm_nettle_optional_list ; do
+ dnl Note extra pair of [] in sed expression
+ tmp_b=`echo "$tmp_n" | sed 's/\.[[^.]]*$//'`
for asm_dir in $asm_path ; do
if test -f "$srcdir/$asm_dir/$tmp_n"; then
asm_file_list="$asm_file_list $tmp_n"
@@ -325,12 +327,14 @@ if test "x$enable_assembler" = xyes ; then
done <<EOF
[`sed -n 's/[^ ]*PROLOGUE(_*\(nettle_\)*\([^)]*\)).*$/\2/p' < "$srcdir/$asm_dir/$tmp_n"`]
EOF
- OPT_ASM_NETTLE_SOURCES="$OPT_ASM_NETTLE_SOURCES $tmp_n"
+ OPT_NETTLE_OBJS="$OPT_NETTLE_OBJS $tmp_b"'.$(OBJEXT)'
break
fi
done
done
for tmp_h in $asm_hogweed_optional_list ; do
+ dnl Note extra pair of [] in sed expression
+ tmp_b=`echo "$tmp_h" | sed 's/\.[[^.]]*$//'`
for asm_dir in $asm_path ; do
if test -f "$srcdir/$asm_dir/$tmp_h"; then
asm_file_list="$asm_file_list $tmp_h"
@@ -341,7 +345,7 @@ EOF
done <<EOF
[`sed -n 's/[^ ]*PROLOGUE(_*\(nettle_\)*\([^)]*\)).*$/\2/p' < "$srcdir/$asm_dir/$tmp_h"`]
EOF
- OPT_ASM_HOGWEED_SOURCES="$OPT_ASM_HOGWEED_SOURCES $tmp_h"
+ OPT_HOGWEED_OBJS="$OPT_HOGWEED_OBJS $tmp_b"'.$(OBJEXT)'
break
fi
done
@@ -361,8 +365,8 @@ EOF
esac
fi
-AC_SUBST([OPT_ASM_NETTLE_SOURCES])
-AC_SUBST([OPT_ASM_HOGWEED_SOURCES])
+AC_SUBST([OPT_NETTLE_OBJS])
+AC_SUBST([OPT_HOGWEED_OBJS])
AC_SUBST([ASM_RODATA])
if test "x$enable_assembler" = xyes ; then
IF_ASM=''
--
GitLab