Skip to content

Commit efa3cae

Browse files
stweilstweil
committed
Simplify unittest/Makefile.am
Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent 41f91c9 commit efa3cae

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

‎unittest/Makefile.am

+21-20
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ TESS_LIBS = $(top_builddir)/src/api/libtesseract.la $(libarchive_LIBS)
101101
TESS_LIBS += $(TENSORFLOW_LIBS)
102102
TRAINING_LIBS = $(top_builddir)/src/training/libtesseract_training.la
103103
TRAINING_LIBS += $(top_builddir)/src/training/libtesseract_tessopt.la
104+
TRAINING_LIBS += $(TESS_LIBS)
104105
AM_CPPFLAGS += -isystem $(top_srcdir)/googletest/googletest/include \
105106
-isystem $(top_srcdir)/googletest/googlemock/include
106107

@@ -202,7 +203,7 @@ colpartition_test_SOURCES = colpartition_test.cc
202203
colpartition_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
203204

204205
commandlineflags_test_SOURCES = commandlineflags_test.cc
205-
commandlineflags_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_UC_LIBS)
206+
commandlineflags_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_UC_LIBS)
206207

207208
dawg_test_SOURCES = dawg_test.cc
208209
dawg_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
@@ -236,13 +237,13 @@ intsimdmatrix_test_CPPFLAGS += -DSSE4_1
236237
endif
237238

238239
lang_model_test_SOURCES = lang_model_test.cc
239-
lang_model_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
240+
lang_model_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
240241

241242
layout_test_SOURCES = layout_test.cc
242243
layout_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS) $(LEPTONICA_LIBS)
243244

244245
ligature_table_test_SOURCES = ligature_table_test.cc
245-
ligature_table_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS)
246+
ligature_table_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS)
246247
ligature_table_test_LDADD += $(ICU_I18N_LIBS) $(ICU_UC_LIBS) -lfontconfig
247248
ligature_table_test_LDADD += -lpangocairo-1.0 -lpangoft2-1.0
248249
ligature_table_test_LDADD += $(cairo_LIBS) $(pango_LIBS)
@@ -254,25 +255,25 @@ loadlang_test_SOURCES = loadlang_test.cc
254255
loadlang_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS) $(LEPTONICA_LIBS)
255256

256257
lstm_recode_test_SOURCES = lstm_recode_test.cc
257-
lstm_recode_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TESS_LIBS) $(TRAINING_LIBS)
258+
lstm_recode_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS)
258259

259260
lstm_squashed_test_SOURCES = lstm_squashed_test.cc
260-
lstm_squashed_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TESS_LIBS) $(TRAINING_LIBS)
261+
lstm_squashed_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS)
261262

262263
lstm_test_SOURCES = lstm_test.cc
263-
lstm_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TESS_LIBS) $(TRAINING_LIBS)
264+
lstm_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS)
264265

265266
lstmtrainer_test_SOURCES = lstmtrainer_test.cc
266-
lstmtrainer_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TESS_LIBS) $(TRAINING_LIBS) $(LEPTONICA_LIBS)
267+
lstmtrainer_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(LEPTONICA_LIBS)
267268

268269
mastertrainer_test_SOURCES = mastertrainer_test.cc
269-
mastertrainer_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS)
270+
mastertrainer_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS)
270271

271272
matrix_test_SOURCES = matrix_test.cc
272273
matrix_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
273274

274275
normstrngs_test_SOURCES = normstrngs_test.cc
275-
normstrngs_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
276+
normstrngs_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
276277

277278
nthitem_test_SOURCES = nthitem_test.cc
278279
nthitem_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
@@ -297,13 +298,13 @@ qrsequence_test_SOURCES = qrsequence_test.cc
297298
qrsequence_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TESS_LIBS)
298299

299300
recodebeam_test_SOURCES = recodebeam_test.cc
300-
recodebeam_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
301+
recodebeam_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
301302

302303
rect_test_SOURCES = rect_test.cc
303304
rect_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
304305

305306
resultiterator_test_SOURCES = resultiterator_test.cc
306-
resultiterator_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(LEPTONICA_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
307+
resultiterator_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(LEPTONICA_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
307308

308309
scanutils_test_SOURCES = scanutils_test.cc
309310
scanutils_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
@@ -315,7 +316,7 @@ stats_test_SOURCES = stats_test.cc
315316
stats_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
316317

317318
stringrenderer_test_SOURCES = stringrenderer_test.cc
318-
stringrenderer_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(LEPTONICA_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS) -lfontconfig -lpangocairo-1.0 -lpangoft2-1.0 $(cairo_LIBS) $(pango_LIBS)
319+
stringrenderer_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(LEPTONICA_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS) -lfontconfig -lpangocairo-1.0 -lpangoft2-1.0 $(cairo_LIBS) $(pango_LIBS)
319320

320321
tablefind_test_SOURCES = tablefind_test.cc
321322
tablefind_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
@@ -333,28 +334,28 @@ tfile_test_SOURCES = tfile_test.cc
333334
tfile_test_LDADD = $(GTEST_LIBS) $(TESS_LIBS)
334335

335336
unichar_test_SOURCES = unichar_test.cc
336-
unichar_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_UC_LIBS)
337+
unichar_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_UC_LIBS)
337338

338339
unicharcompress_test_SOURCES = unicharcompress_test.cc
339-
unicharcompress_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_UC_LIBS)
340+
unicharcompress_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_UC_LIBS)
340341

341342
unicharset_test_SOURCES = unicharset_test.cc
342-
unicharset_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_UC_LIBS)
343+
unicharset_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_UC_LIBS)
343344

344345
validate_grapheme_test_SOURCES = validate_grapheme_test.cc
345-
validate_grapheme_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
346+
validate_grapheme_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
346347

347348
validate_indic_test_SOURCES = validate_indic_test.cc
348-
validate_indic_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
349+
validate_indic_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
349350

350351
validate_khmer_test_SOURCES = validate_khmer_test.cc
351-
validate_khmer_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
352+
validate_khmer_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
352353

353354
validate_myanmar_test_SOURCES = validate_myanmar_test.cc
354-
validate_myanmar_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
355+
validate_myanmar_test_LDADD = $(ABSEIL_LIBS) $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_I18N_LIBS) $(ICU_UC_LIBS)
355356

356357
validator_test_SOURCES = validator_test.cc
357-
validator_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(TESS_LIBS) $(ICU_UC_LIBS)
358+
validator_test_LDADD = $(GTEST_LIBS) $(TRAINING_LIBS) $(ICU_UC_LIBS)
358359

359360
# for windows
360361
if T_WIN

0 commit comments

Comments
 (0)