From 953ca26d28a0b37088019fc9daa6f2cb4844c539 Mon Sep 17 00:00:00 2001 From: Alexey Sheplyakov Date: Sat, 2 Jan 2021 01:43:40 +0400 Subject: [PATCH] Revert "[build] Rename cl_asm files to make CMake happy" This reverts commit e67df7a533c7f768f48a591ec3b6f1e4cf4cdbe4. Apparently it causes `make distclean` (autotools) to remove asm sources. --- src/Makefile.am | 15 +++++++++++++-- src/base/digitseq/{cl_asm.S => cl_asm_.cc} | 0 .../elem/{cl_asm_GF2.S => cl_asm_GF2.cc} | 0 3 files changed, 13 insertions(+), 2 deletions(-) rename src/base/digitseq/{cl_asm.S => cl_asm_.cc} (100%) rename src/polynomial/elem/{cl_asm_GF2.S => cl_asm_GF2.cc} (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 244abb4..4067bcf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,7 +54,6 @@ base/digitseq/cl_DS_recipsqrt.cc \ base/digitseq/cl_DS_sqrt.cc \ base/digitseq/cl_DS_trandom.cc \ base/digitseq/cl_asm.h \ -base/digitseq/cl_asm.S \ base/hash/cl_hash.h \ base/hash/cl_hash1.h \ base/hash/cl_hash1weak.h \ @@ -744,7 +743,6 @@ polynomial/elem/cl_UP_named.cc \ polynomial/elem/cl_UP_no_ring.cc \ polynomial/elem/cl_UP_number.h \ polynomial/elem/cl_UP_unnamed.cc \ -polynomial/elem/cl_asm_GF2.S \ polynomial/misc/cl_UP_I_hermite.cc \ polynomial/misc/cl_UP_I_laguerre.cc \ polynomial/misc/cl_UP_I_tchebychev.cc \ @@ -948,8 +946,13 @@ vector/output/cl_GV_number_aprint.cc \ vector/output/cl_SV_aprint.cc \ vector/output/cl_SV_number_aprint.cc +nodist_libcln_la_SOURCES = \ +base/digitseq/cl_asm.S \ +polynomial/elem/cl_asm_GF2.S + ASMFILES = \ +base/digitseq/cl_asm_.cc \ base/digitseq/cl_asm_arm.h \ base/digitseq/cl_asm_arm_.cc \ base/digitseq/cl_asm_hppa.h \ @@ -966,9 +969,17 @@ base/digitseq/cl_asm_sparc64.h \ base/digitseq/cl_asm_sparc64_.cc \ base/digitseq/cl_asm_sparc_.cc +base/digitseq/cl_asm.S: $(ASMFILES) + $(MKDIR_P) base/digitseq; cp $< $@ + MORE_ASMFILES = \ +polynomial/elem/cl_asm_GF2.cc \ polynomial/elem/cl_asm_sparc_GF2.cc + +polynomial/elem/cl_asm_GF2.S: $(MORE_ASMFILES) + $(MKDIR_P) polynomial/elem; cp $< $@ + EXTRA_DIST = $(ASMFILES) $(MORE_ASMFILES) DISTCLEANFILES = \ diff --git a/src/base/digitseq/cl_asm.S b/src/base/digitseq/cl_asm_.cc similarity index 100% rename from src/base/digitseq/cl_asm.S rename to src/base/digitseq/cl_asm_.cc diff --git a/src/polynomial/elem/cl_asm_GF2.S b/src/polynomial/elem/cl_asm_GF2.cc similarity index 100% rename from src/polynomial/elem/cl_asm_GF2.S rename to src/polynomial/elem/cl_asm_GF2.cc -- 2.49.0