]> www.ginac.de Git - cln.git/commitdiff
Revert "[build] Rename cl_asm files to make CMake happy"
authorAlexey Sheplyakov <asheplyakov@altlinux.org>
Fri, 1 Jan 2021 21:43:40 +0000 (01:43 +0400)
committerAlexey Sheplyakov <asheplyakov@altlinux.org>
Sun, 3 Jan 2021 06:54:47 +0000 (10:54 +0400)
This reverts commit e67df7a533c7f768f48a591ec3b6f1e4cf4cdbe4.
Apparently it causes `make distclean` (autotools) to remove asm sources.

src/Makefile.am
src/base/digitseq/cl_asm_.cc [moved from src/base/digitseq/cl_asm.S with 100% similarity]
src/polynomial/elem/cl_asm_GF2.cc [moved from src/polynomial/elem/cl_asm_GF2.S with 100% similarity]

index 244abb40d735b1018ab4e3704b56b06720ccaf66..4067bcfc225d864ff048aa5b5da350560b61661a 100644 (file)
@@ -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 = \