From 399a3d99e3dd9b8ac2b867b4ec5bdde4ac10f3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 3 Sep 2014 23:16:20 +0200
Subject: [PATCH] Simplify .asm-related make rules.
---
ChangeLog | 7 +++++++
Makefile.in | 13 +++++--------
config.make.in | 2 +-
configure.ac | 16 ----------------
4 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5a20c89f..20c7d2b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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.
diff --git a/Makefile.in b/Makefile.in
index 43aac2de..a35f8ad1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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)
diff --git a/config.make.in b/config.make.in
index a8ab49fa..8d5f4b3f 100644
--- a/config.make.in
+++ b/config.make.in
@@ -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
diff --git a/configure.ac b/configure.ac
index 07fc9944..3e464e71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
--
GitLab