More makefile changes to remove cube

tesseract-ocr · Dec 14, 2016 · 81ebba0 · 81ebba0
1 parent 5c3839b
commit 81ebba0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 47 deletions.
diff --git a/api/Makefile.am b/api/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"\
     -DUSE_STD_NAMESPACE \
     -I$(top_srcdir)/arch -I$(top_srcdir)/lstm \
-    -I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct -I$(top_srcdir)/cube \
+    -I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct \
     -I$(top_srcdir)/viewer \
     -I$(top_srcdir)/textord -I$(top_srcdir)/dict \
     -I$(top_srcdir)/classify -I$(top_srcdir)/ccmain \
@@ -36,10 +36,6 @@ libtesseract_api_la_LIBADD = \
     ../viewer/libtesseract_viewer.la \
     ../ccutil/libtesseract_ccutil.la \
     ../opencl/libtesseract_opencl.la 
-    if !NO_CUBE_BUILD
-        libtesseract_api_la_LIBADD += ../cube/libtesseract_cube.la \
-            ../neural_networks/runtime/libtesseract_neural.la \
-    endif
 endif
 
 libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -69,10 +65,6 @@ libtesseract_la_LIBADD = \
     ../viewer/libtesseract_viewer.la \
     ../ccutil/libtesseract_ccutil.la \
     ../opencl/libtesseract_opencl.la 
-if !NO_CUBE_BUILD
-libtesseract_la_LIBADD += ../cube/libtesseract_cube.la \
-        ../neural_networks/runtime/libtesseract_neural.la
-endif
 
 libtesseract_la_LDFLAGS += -version-info $(GENERIC_LIBRARY_VERSION) -no-undefined
 

diff --git a/tessdata/Makefile.am b/tessdata/Makefile.am
@@ -27,22 +27,7 @@ langdata = bul.traineddata mlt.traineddata chr.traineddata \
 	tur.traineddata epo.traineddata msa.traineddata \
 	kor.traineddata isl.traineddata jpn.traineddata \
 	chi_tra.traineddata ita.traineddata spa_old.traineddata \
-	deu-frak.traineddata aze.traineddata fra.cube.lm \
-	ita.tesseract_cube.nn eng.cube.word-freq rus.cube.lm \
-	spa.cube.size fra.cube.nn fra.cube.params rus.cube.size \
-	fra.cube.fold eng.cube.size ita.cube.bigrams \
-	eng.tesseract_cube.nn rus.cube.params hin.cube.nn \
-	spa.cube.params hin.cube.lm fra.cube.word-freq \
-	spa.cube.word-freq ara.cube.nn ara.cube.word-freq \
-	spa.cube.fold eng.cube.nn eng.cube.params eng.cube.lm \
-	ita.cube.size hin.tesseract_cube.nn ita.cube.lm \
-	fra.cube.bigrams ara.cube.fold spa.cube.bigrams \
-	hin.cube.word-freq rus.cube.word-freq ita.cube.word-freq \
-	fra.tesseract_cube.nn rus.cube.fold ara.cube.size \
-	eng.cube.fold ita.cube.params ara.cube.params ita.cube.fold \
-	ara.cube.bigrams hin.cube.params hin.cube.fold spa.cube.lm \
-	ita.cube.nn fra.cube.size eng.cube.bigrams ara.cube.lm \
-	rus.cube.nn spa.cube.nn hin.cube.bigrams
+	deu-frak.traineddata aze.traineddata
 
 uninstall-local:
 	cd $(DESTDIR)$(datadir); \

diff --git a/training/Makefile.am b/training/Makefile.am
@@ -58,8 +58,6 @@ ambiguous_words_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -85,8 +83,6 @@ classifier_tester_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -121,8 +117,6 @@ cntraining_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -145,8 +139,6 @@ dawg2wordlist_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../textord/libtesseract_textord.la \
     ../ccutil/libtesseract_ccutil.la
@@ -173,8 +165,6 @@ lstmeval_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -200,8 +190,6 @@ lstmtraining_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -227,8 +215,6 @@ mftraining_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -253,8 +239,6 @@ set_unicharset_properties_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -279,8 +263,6 @@ shapeclustering_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -306,8 +288,6 @@ text2image_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../ccutil/libtesseract_ccutil.la
 else
@@ -345,8 +325,6 @@ wordlist2dawg_LDADD += \
     ../cutil/libtesseract_cutil.la \
     ../viewer/libtesseract_viewer.la \
     ../ccmain/libtesseract_main.la \
-    ../cube/libtesseract_cube.la \
-    ../neural_networks/runtime/libtesseract_neural.la \
     ../wordrec/libtesseract_wordrec.la \
     ../textord/libtesseract_textord.la \
     ../ccutil/libtesseract_ccutil.la