Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dmitry Baryshkov
nettle
Commits
1f0c7e6b
Commit
1f0c7e6b
authored
Jan 12, 2015
by
Niels Möller
Browse files
Replace OPT_ASM_NETTLE_SOURCES by OPT_NETTLE_OBJS, and similarly for hogweed.
parent
530014f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
1f0c7e6b
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.
...
...
Makefile.in
View file @
1f0c7e6b
...
...
@@ -12,8 +12,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM
=
$(INSTALL_PROGRAM)
-s
MKDIR_P
=
@MKDIR_P@
OPT_
ASM_
NETTLE_
SOURCE
S
=
@OPT_
ASM_
NETTLE_
SOURCE
S@
OPT_
ASM_
HOGWEED_
SOURCE
S
=
@OPT_
ASM_
HOGWEED_
SOURCE
S@
OPT_NETTLE_
OBJ
S
=
@OPT_NETTLE_
OBJ
S@
OPT_HOGWEED_
OBJ
S
=
@OPT_HOGWEED_
OBJ
S@
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
$@
...
...
configure.ac
View file @
1f0c7e6b
...
...
@@ -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_
SOURCE
S=""
OPT_
ASM_
HOGWEED_
SOURCE
S=""
OPT_NETTLE_
OBJ
S=""
OPT_HOGWEED_
OBJ
S=""
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_
SOURCE
S="$OPT_
ASM_
NETTLE_
SOURCE
S $tmp_
n"
OPT_NETTLE_
OBJ
S="$OPT_NETTLE_
OBJ
S $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_
SOURCE
S="$OPT_
ASM_
HOGWEED_
SOURCE
S $tmp_
h"
OPT_HOGWEED_
OBJ
S="$OPT_HOGWEED_
OBJ
S $tmp_
b"'.$(OBJEXT)'
break
fi
done
...
...
@@ -361,8 +365,8 @@ EOF
esac
fi
AC_SUBST([OPT_
ASM_
NETTLE_
SOURCE
S])
AC_SUBST([OPT_
ASM_
HOGWEED_
SOURCE
S])
AC_SUBST([OPT_NETTLE_
OBJ
S])
AC_SUBST([OPT_HOGWEED_
OBJ
S])
AC_SUBST([ASM_RODATA])
if test "x$enable_assembler" = xyes ; then
IF_ASM=''
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment