Commit 399a3d99 authored by Niels Möller's avatar Niels Möller

Simplify .asm-related make rules.

parent f3afe9fa
2014-09-03 Niels Möller <nisse@lysator.liu.se> 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 * Makefile.in: Delete all uses of *.po files, use the same object
files for both shared and static libraries. files for both shared and static libraries.
* configure.ac (dummy-dep-files): Don't create any .po.d files. * configure.ac (dummy-dep-files): Don't create any .po.d files.
......
...@@ -360,13 +360,10 @@ ecc-384.$(OBJEXT): ecc-384.h ...@@ -360,13 +360,10 @@ ecc-384.$(OBJEXT): ecc-384.h
ecc-521.$(OBJEXT): ecc-521.h ecc-521.$(OBJEXT): ecc-521.h
ecc-25519.$(OBJEXT): ecc-25519.h ecc-25519.$(OBJEXT): ecc-25519.h
.asm.s: $(srcdir)/asm.m4 machine.m4 config.m4 .asm.$(OBJEXT): $(srcdir)/asm.m4 machine.m4 config.m4
$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$@T \ $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$*.s
&& test -s $@T && mv -f $@T $@ $(COMPILE) -c $*.s
@echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d
.s.$(OBJEXT):
$(COMPILE) -c $<
@echo > $@.d
# Texinfo rules # Texinfo rules
.texinfo.info: .texinfo.info:
...@@ -628,5 +625,5 @@ maintainer-clean-here: ...@@ -628,5 +625,5 @@ maintainer-clean-here:
tags-here: tags-here:
etags -o $(srcdir)/TAGS $(srcdir)/*.c $(srcdir)/*.h 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) @DEP_INCLUDE@ $(DEP_FILES)
...@@ -83,7 +83,7 @@ default: all ...@@ -83,7 +83,7 @@ default: all
# compile was broken when .SUFFIXES was moved here from Makefile.in. # compile was broken when .SUFFIXES was moved here from Makefile.in.
.SUFFIXES: .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 # Disable builtin rule
%$(EXEEXT) : %.c %$(EXEEXT) : %.c
......
...@@ -373,22 +373,6 @@ AH_VERBATIM([HAVE_NATIVE], ...@@ -373,22 +373,6 @@ AH_VERBATIM([HAVE_NATIVE],
#undef HAVE_NATIVE_ecc_521_redc #undef HAVE_NATIVE_ecc_521_redc
#undef HAVE_NATIVE_gcm_hash8]) #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 if test "x$enable_pic" = xyes; then
LSH_CCPIC LSH_CCPIC
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment