Skip to content

Commit 81ebba0

Browse files
theraysmiththeraysmith
committed
More makefile changes to remove cube
1 parent 5c3839b commit 81ebba0

File tree

3 files changed

+2
-47
lines changed

3 files changed

+2
-47
lines changed

‎api/Makefile.am

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"\
22
-DUSE_STD_NAMESPACE \
33
-I$(top_srcdir)/arch -I$(top_srcdir)/lstm \
4-
-I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct -I$(top_srcdir)/cube \
4+
-I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct \
55
-I$(top_srcdir)/viewer \
66
-I$(top_srcdir)/textord -I$(top_srcdir)/dict \
77
-I$(top_srcdir)/classify -I$(top_srcdir)/ccmain \
@@ -36,10 +36,6 @@ libtesseract_api_la_LIBADD = \
3636
../viewer/libtesseract_viewer.la \
3737
../ccutil/libtesseract_ccutil.la \
3838
../opencl/libtesseract_opencl.la
39-
if !NO_CUBE_BUILD
40-
libtesseract_api_la_LIBADD += ../cube/libtesseract_cube.la \
41-
../neural_networks/runtime/libtesseract_neural.la \
42-
endif
4339
endif
4440

4541
libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -69,10 +65,6 @@ libtesseract_la_LIBADD = \
6965
../viewer/libtesseract_viewer.la \
7066
../ccutil/libtesseract_ccutil.la \
7167
../opencl/libtesseract_opencl.la
72-
if !NO_CUBE_BUILD
73-
libtesseract_la_LIBADD += ../cube/libtesseract_cube.la \
74-
../neural_networks/runtime/libtesseract_neural.la
75-
endif
7668

7769
libtesseract_la_LDFLAGS += -version-info $(GENERIC_LIBRARY_VERSION) -no-undefined
7870

‎tessdata/Makefile.am

+1-16
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,7 @@ langdata = bul.traineddata mlt.traineddata chr.traineddata \
2727
tur.traineddata epo.traineddata msa.traineddata \
2828
kor.traineddata isl.traineddata jpn.traineddata \
2929
chi_tra.traineddata ita.traineddata spa_old.traineddata \
30-
deu-frak.traineddata aze.traineddata fra.cube.lm \
31-
ita.tesseract_cube.nn eng.cube.word-freq rus.cube.lm \
32-
spa.cube.size fra.cube.nn fra.cube.params rus.cube.size \
33-
fra.cube.fold eng.cube.size ita.cube.bigrams \
34-
eng.tesseract_cube.nn rus.cube.params hin.cube.nn \
35-
spa.cube.params hin.cube.lm fra.cube.word-freq \
36-
spa.cube.word-freq ara.cube.nn ara.cube.word-freq \
37-
spa.cube.fold eng.cube.nn eng.cube.params eng.cube.lm \
38-
ita.cube.size hin.tesseract_cube.nn ita.cube.lm \
39-
fra.cube.bigrams ara.cube.fold spa.cube.bigrams \
40-
hin.cube.word-freq rus.cube.word-freq ita.cube.word-freq \
41-
fra.tesseract_cube.nn rus.cube.fold ara.cube.size \
42-
eng.cube.fold ita.cube.params ara.cube.params ita.cube.fold \
43-
ara.cube.bigrams hin.cube.params hin.cube.fold spa.cube.lm \
44-
ita.cube.nn fra.cube.size eng.cube.bigrams ara.cube.lm \
45-
rus.cube.nn spa.cube.nn hin.cube.bigrams
30+
deu-frak.traineddata aze.traineddata
4631

4732
uninstall-local:
4833
cd $(DESTDIR)$(datadir); \

‎training/Makefile.am

-22
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ ambiguous_words_LDADD += \
5858
../cutil/libtesseract_cutil.la \
5959
../viewer/libtesseract_viewer.la \
6060
../ccmain/libtesseract_main.la \
61-
../cube/libtesseract_cube.la \
62-
../neural_networks/runtime/libtesseract_neural.la \
6361
../wordrec/libtesseract_wordrec.la \
6462
../ccutil/libtesseract_ccutil.la
6563
else
@@ -85,8 +83,6 @@ classifier_tester_LDADD += \
8583
../cutil/libtesseract_cutil.la \
8684
../viewer/libtesseract_viewer.la \
8785
../ccmain/libtesseract_main.la \
88-
../cube/libtesseract_cube.la \
89-
../neural_networks/runtime/libtesseract_neural.la \
9086
../wordrec/libtesseract_wordrec.la \
9187
../ccutil/libtesseract_ccutil.la
9288
else
@@ -121,8 +117,6 @@ cntraining_LDADD += \
121117
../cutil/libtesseract_cutil.la \
122118
../viewer/libtesseract_viewer.la \
123119
../ccmain/libtesseract_main.la \
124-
../cube/libtesseract_cube.la \
125-
../neural_networks/runtime/libtesseract_neural.la \
126120
../wordrec/libtesseract_wordrec.la \
127121
../ccutil/libtesseract_ccutil.la
128122
else
@@ -145,8 +139,6 @@ dawg2wordlist_LDADD += \
145139
../cutil/libtesseract_cutil.la \
146140
../viewer/libtesseract_viewer.la \
147141
../ccmain/libtesseract_main.la \
148-
../cube/libtesseract_cube.la \
149-
../neural_networks/runtime/libtesseract_neural.la \
150142
../wordrec/libtesseract_wordrec.la \
151143
../textord/libtesseract_textord.la \
152144
../ccutil/libtesseract_ccutil.la
@@ -173,8 +165,6 @@ lstmeval_LDADD += \
173165
../cutil/libtesseract_cutil.la \
174166
../viewer/libtesseract_viewer.la \
175167
../ccmain/libtesseract_main.la \
176-
../cube/libtesseract_cube.la \
177-
../neural_networks/runtime/libtesseract_neural.la \
178168
../wordrec/libtesseract_wordrec.la \
179169
../ccutil/libtesseract_ccutil.la
180170
else
@@ -200,8 +190,6 @@ lstmtraining_LDADD += \
200190
../cutil/libtesseract_cutil.la \
201191
../viewer/libtesseract_viewer.la \
202192
../ccmain/libtesseract_main.la \
203-
../cube/libtesseract_cube.la \
204-
../neural_networks/runtime/libtesseract_neural.la \
205193
../wordrec/libtesseract_wordrec.la \
206194
../ccutil/libtesseract_ccutil.la
207195
else
@@ -227,8 +215,6 @@ mftraining_LDADD += \
227215
../cutil/libtesseract_cutil.la \
228216
../viewer/libtesseract_viewer.la \
229217
../ccmain/libtesseract_main.la \
230-
../cube/libtesseract_cube.la \
231-
../neural_networks/runtime/libtesseract_neural.la \
232218
../wordrec/libtesseract_wordrec.la \
233219
../ccutil/libtesseract_ccutil.la
234220
else
@@ -253,8 +239,6 @@ set_unicharset_properties_LDADD += \
253239
../cutil/libtesseract_cutil.la \
254240
../viewer/libtesseract_viewer.la \
255241
../ccmain/libtesseract_main.la \
256-
../cube/libtesseract_cube.la \
257-
../neural_networks/runtime/libtesseract_neural.la \
258242
../wordrec/libtesseract_wordrec.la \
259243
../ccutil/libtesseract_ccutil.la
260244
else
@@ -279,8 +263,6 @@ shapeclustering_LDADD += \
279263
../cutil/libtesseract_cutil.la \
280264
../viewer/libtesseract_viewer.la \
281265
../ccmain/libtesseract_main.la \
282-
../cube/libtesseract_cube.la \
283-
../neural_networks/runtime/libtesseract_neural.la \
284266
../wordrec/libtesseract_wordrec.la \
285267
../ccutil/libtesseract_ccutil.la
286268
else
@@ -306,8 +288,6 @@ text2image_LDADD += \
306288
../cutil/libtesseract_cutil.la \
307289
../viewer/libtesseract_viewer.la \
308290
../ccmain/libtesseract_main.la \
309-
../cube/libtesseract_cube.la \
310-
../neural_networks/runtime/libtesseract_neural.la \
311291
../wordrec/libtesseract_wordrec.la \
312292
../ccutil/libtesseract_ccutil.la
313293
else
@@ -345,8 +325,6 @@ wordlist2dawg_LDADD += \
345325
../cutil/libtesseract_cutil.la \
346326
../viewer/libtesseract_viewer.la \
347327
../ccmain/libtesseract_main.la \
348-
../cube/libtesseract_cube.la \
349-
../neural_networks/runtime/libtesseract_neural.la \
350328
../wordrec/libtesseract_wordrec.la \
351329
../textord/libtesseract_textord.la \
352330
../ccutil/libtesseract_ccutil.la

0 commit comments

Comments
 (0)