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
Nettle
nettle
Commits
399a3d99
Commit
399a3d99
authored
Sep 03, 2014
by
Niels Möller
Browse files
Simplify .asm-related make rules.
parent
f3afe9fa
Changes
4
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
399a3d99
2014-09-03 Niels Möller <nisse@lysator.liu.se>
* Makefile.in: Revert 2013-02-06 Makefile changes: use a single
rule for transforming .asm to .o, and drop include of asm.d.
Possible now since we generate a single object file from each asm
file. This change also helps Solaris' make recognize .asm files.
* config.make.in (.SUFFIXES): Drop .s from list.
* configure.ac: Delete code to generate asm.d.
* Makefile.in: Delete all uses of *.po files, use the same object
files for both shared and static libraries.
* configure.ac (dummy-dep-files): Don't create any .po.d files.
...
...
Makefile.in
View file @
399a3d99
...
...
@@ -360,13 +360,10 @@ ecc-384.$(OBJEXT): ecc-384.h
ecc-521.$(OBJEXT)
:
ecc-521.h
ecc-25519.$(OBJEXT)
:
ecc-25519.h
.asm.s
:
$(srcdir)/asm.m4 machine.m4 config.m4
$(M4)
$(srcdir)
/asm.m4 machine.m4 config.m4
$<
>
$@
T
\
&&
test
-s
$@
T
&&
mv
-f
$@
T
$@
.s.$(OBJEXT)
:
$(COMPILE)
-c
$<
@
echo
>
$@
.d
.asm.$(OBJEXT)
:
$(srcdir)/asm.m4 machine.m4 config.m4
$(M4)
$(srcdir)
/asm.m4 machine.m4 config.m4
$<
>
$*
.s
$(COMPILE)
-c
$*
.s
@
echo
"
$@
:
$<
$(srcdir)
/asm.m4 machine.m4 config.m4"
>
$@
.d
# Texinfo rules
.texinfo.info
:
...
...
@@ -628,5 +625,5 @@ maintainer-clean-here:
tags-here
:
etags
-o
$(srcdir)
/TAGS
$(srcdir)
/
*
.c
$(srcdir)
/
*
.h
DEP_FILES
=
$
(
SOURCES:.c
=
.
$(OBJEXT)
.d
)
asm.d
DEP_FILES
=
$
(
SOURCES:.c
=
.
$(OBJEXT)
.d
)
@DEP_INCLUDE@
$(DEP_FILES)
config.make.in
View file @
399a3d99
...
...
@@ -83,7 +83,7 @@ default: all
# compile was broken when .SUFFIXES was moved here from Makefile.in.
.SUFFIXES:
.SUFFIXES: .asm
.s
.c .$(OBJEXT) .p$(OBJEXT) .html .dvi .info .exe .pdf .ps .texinfo
.SUFFIXES: .asm .c .$(OBJEXT) .p$(OBJEXT) .html .dvi .info .exe .pdf .ps .texinfo
# Disable builtin rule
%$(EXEEXT) : %.c
...
...
configure.ac
View file @
399a3d99
...
...
@@ -373,22 +373,6 @@ AH_VERBATIM([HAVE_NATIVE],
#undef HAVE_NATIVE_ecc_521_redc
#undef HAVE_NATIVE_gcm_hash8])
# Besides getting correct dependencies, the explicit rules also tell
# make that the .s files "ought to exist", so they are preferred over
# .c files.
AC_CONFIG_COMMANDS([asm.d],
[ for f in $asm_file_list
do
case $f in
*.asm)
echo "`basename $f .asm`.s : $f "'$(srcdir)/asm.m4 machine.m4 config.m4'
;;
esac
done > asm.d
],
[ asm_file_list="$asm_file_list" ]
)
if test "x$enable_pic" = xyes; then
LSH_CCPIC
else
...
...
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