Commit 0c7dc2f3 for tesseract
commit 0c7dc2f312e12c6dd1efceff5d82fa01106446bb
Author: Stefan Weil <sw@weilnetz.de>
Date: Wed Nov 18 19:55:30 2026 +0100
Fix unresolved merge conflict in Makefile.am
Commit d7960fddd left the conflict markers of a rebase in the rules
for the unit tests, so automake failed:
Makefile.am:1665: error: bad characters in variable name ''
Both sides are needed: keep the rules for weightmatrix_product_test
(added by that commit) and for weightmatrix_range_test, as in the
commit before the rebase.
Fixes: d7960fddd ("lstm: calculate several dot products at once with NEON")
Assisted-by: Claude Fable 5.2 (Anthropic)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
diff --git a/Makefile.am b/Makefile.am
index 46d351ac..c7e066c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1658,15 +1658,13 @@ weightmatrix_intdim_test_SOURCES = unittest/weightmatrix_intdim_test.cc
weightmatrix_intdim_test_CPPFLAGS = $(unittest_CPPFLAGS)
weightmatrix_intdim_test_LDADD = $(TESS_LIBS)
-<<<<<<< HEAD
-weightmatrix_range_test_SOURCES = unittest/weightmatrix_range_test.cc
-weightmatrix_range_test_CPPFLAGS = $(unittest_CPPFLAGS)
-weightmatrix_range_test_LDADD = $(TESS_LIBS)
-=======
weightmatrix_product_test_SOURCES = unittest/weightmatrix_product_test.cc
weightmatrix_product_test_CPPFLAGS = $(unittest_CPPFLAGS)
weightmatrix_product_test_LDADD = $(TESS_LIBS)
->>>>>>> 48aa9b075 (lstm: calculate several dot products at once with NEON)
+
+weightmatrix_range_test_SOURCES = unittest/weightmatrix_range_test.cc
+weightmatrix_range_test_CPPFLAGS = $(unittest_CPPFLAGS)
+weightmatrix_range_test_LDADD = $(TESS_LIBS)
weightmatrix_scales_test_SOURCES = unittest/weightmatrix_scales_test.cc
weightmatrix_scales_test_CPPFLAGS = $(unittest_CPPFLAGS)