diff --git a/INSTALL.SVN b/INSTALL.SVN index 372c6ce4e11117cdd413ffca18fc23ecb98fddc9..940d4c468ac4ef15b365e09a69267c48c1b72dec 100644 --- a/INSTALL.SVN +++ b/INSTALL.SVN @@ -1,15 +1,12 @@ -If you have checked out Tesseract from Subversion, you must generate the configure script. +If you have checked out Tesseract from Subversion, you must generate the +configure script. + +If you have tesseract 3.0x installation in your system, please remove it +before new build. So, the steps for making Tesseract are: - * ./runautoconf # ignore warnings + * ./autogen.sh * ./configure * make * make install - -Note that ./runautoconf may generate some warnings: - - -- quoting in some /usr/share/.../... .m4 files - -- old uses of datarootdir - -They don't seem to hurt anything. We haven't found a good way of eliminating them yet. diff --git a/Makefile.am b/Makefile.am index 993580e94b05ade076805972dc3e53192b70f9b4..802c5878eb740e46becc4d499ce0d9f1c6a7e025 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = ccstruct ccutil classify cube cutil dict image neural_networks/runtime textord viewer wordrec ccmain training tessdata testing java api doc +SUBDIRS = ccutil viewer cutil image ccstruct dict classify wordrec neural_networks/runtime textord cube ccmain api . training java tessdata testing doc #if USING_GETTEXT #SUBDIRS += po #AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" @@ -10,28 +10,6 @@ EXTRA_DIST = eurotext.tif phototest.tif ReleaseNotes \ #EXTRA_DIST = doc/html doc/@PACKAGE_NAME@_@PACKAGE_VERSION@.pdf doc/@PACKAGE_NAME@_@PACKAGE_VERSION@.ps.gz -lib_LTLIBRARIES = libtesseract.la -libtesseract_la_SOURCES = -# Dummy C++ source to cause C++ linking. -# see http://www.gnu.org/s/hello/manual/automake/Libtool-Convenience-Libraries.html#Libtool-Convenience-Libraries -nodist_EXTRA_libtesseract_la_SOURCES = dummy.cxx -libtesseract_la_LIBADD = \ - api/libtesseract_api.la \ - ccmain/libtesseract_main.la \ - cube/libtesseract_cube.la \ - neural_networks/runtime/libtesseract_neural.la \ - textord/libtesseract_textord.la \ - wordrec/libtesseract_wordrec.la \ - classify/libtesseract_classify.la \ - dict/libtesseract_dict.la \ - ccstruct/libtesseract_ccstruct.la \ - image/libtesseract_image.la \ - cutil/libtesseract_cutil.la \ - viewer/libtesseract_viewer.la \ - ccutil/libtesseract_ccutil.la - -libtesseract_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) - dist-hook: # Need to remove .svn directories from directories # added using EXTRA_DIST. $(distdir)/tessdata would in diff --git a/README b/README index f69fbc7c11620ea4eaa2ae581f3b3d4b0eeb1ba1..37ed88c78aa6aaf590080f6ed1f150b57e810bdd 100644 --- a/README +++ b/README @@ -89,6 +89,7 @@ Non-Windows (or Cygwin): You have to tell Tesseract through a standard unix mechanism where to find its data directory. You must either: +./autogen.sh ./configure make make install diff --git a/api/Makefile.am b/api/Makefile.am index daf0e99ccae4ff968ac637eafc62943283e1565c..fcc77eeefbb3b209ed8c0ce599dd6e1a0525adc0 100644 --- a/api/Makefile.am +++ b/api/Makefile.am @@ -1,54 +1,59 @@ -SUBDIRS = AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"\ -I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct \ -I$(top_srcdir)/image -I$(top_srcdir)/viewer \ - -I$(top_srcdir)/ccops -I$(top_srcdir)/dict \ + -I$(top_srcdir)/textord -I$(top_srcdir)/dict \ -I$(top_srcdir)/classify -I$(top_srcdir)/ccmain \ - -I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil \ - -I$(top_srcdir)/textord + -I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil include_HEADERS = \ apitypes.h baseapi.h pageiterator.h resultiterator.h tesseractmain.h +lib_LTLIBRARIES = if !USING_MULTIPLELIBS noinst_LTLIBRARIES = libtesseract_api.la else -lib_LTLIBRARIES = libtesseract_api.la +lib_LTLIBRARIES += libtesseract_api.la libtesseract_api_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_api_la_LIBADD = \ + $(top_srcdir)/ccmain/libtesseract_main.la \ + $(top_srcdir)/cube/libtesseract_cube.la \ + $(top_srcdir)/neural_networks/runtime/libtesseract_neural.la \ + $(top_srcdir)/textord/libtesseract_textord.la \ + $(top_srcdir)/wordrec/libtesseract_wordrec.la \ + $(top_srcdir)/classify/libtesseract_classify.la \ + $(top_srcdir)/dict/libtesseract_dict.la \ + $(top_srcdir)/ccstruct/libtesseract_ccstruct.la \ + $(top_srcdir)/image/libtesseract_image.la \ + $(top_srcdir)/cutil/libtesseract_cutil.la \ + $(top_srcdir)/viewer/libtesseract_viewer.la \ + $(top_srcdir)/ccutil/libtesseract_ccutil.la endif - libtesseract_api_la_SOURCES = baseapi.cpp pageiterator.cpp resultiterator.cpp -libtesseract_api_la_LIBADD = \ - ../ccmain/libtesseract_main.la \ - ../cube/libtesseract_cube.la \ - ../neural_networks/runtime/libtesseract_neural.la \ - ../textord/libtesseract_textord.la \ - ../wordrec/libtesseract_wordrec.la \ - ../classify/libtesseract_classify.la \ - ../dict/libtesseract_dict.la \ - ../ccstruct/libtesseract_ccstruct.la \ - ../image/libtesseract_image.la \ - ../cutil/libtesseract_cutil.la \ - ../viewer/libtesseract_viewer.la \ - ../ccutil/libtesseract_ccutil.la -bin_PROGRAMS = tesseract -tesseract_SOURCES = tesseractmain.cpp -if USING_MULTIPLELIBS -tesseract_LDADD = \ +lib_LTLIBRARIES += libtesseract.la +libtesseract_la_LDFLAGS = +libtesseract_la_SOURCES = +# Dummy C++ source to cause C++ linking. +# see http://www.gnu.org/s/hello/manual/automake/Libtool-Convenience-Libraries.html#Libtool-Convenience-Libraries +nodist_EXTRA_libtesseract_la_SOURCES = dummy.cxx +libtesseract_la_LIBADD = \ libtesseract_api.la \ - ../ccmain/libtesseract_main.la \ - ../textord/libtesseract_textord.la \ - ../wordrec/libtesseract_wordrec.la \ - ../classify/libtesseract_classify.la \ - ../dict/libtesseract_dict.la \ - ../ccstruct/libtesseract_ccstruct.la \ - ../image/libtesseract_image.la \ - ../cutil/libtesseract_cutil.la \ - ../viewer/libtesseract_viewer.la \ - ../ccutil/libtesseract_ccutil.la -else -tesseract_LDADD = \ - libtesseract.la -endif + $(top_srcdir)/ccmain/libtesseract_main.la \ + $(top_srcdir)/cube/libtesseract_cube.la \ + $(top_srcdir)/neural_networks/runtime/libtesseract_neural.la \ + $(top_srcdir)/textord/libtesseract_textord.la \ + $(top_srcdir)/wordrec/libtesseract_wordrec.la \ + $(top_srcdir)/classify/libtesseract_classify.la \ + $(top_srcdir)/dict/libtesseract_dict.la \ + $(top_srcdir)/ccstruct/libtesseract_ccstruct.la \ + $(top_srcdir)/image/libtesseract_image.la \ + $(top_srcdir)/cutil/libtesseract_cutil.la \ + $(top_srcdir)/viewer/libtesseract_viewer.la \ + $(top_srcdir)/ccutil/libtesseract_ccutil.la +libtesseract_la_LDFLAGS += -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_la_LDFLAGS += -L./ -L../ -L../api -L../ccutil -L../viewer -L../cutil -L../image -L../ccstruct -L../dict -L../classify -L../wordrec -L../neural_networks/runtime -L../textord -L../cube -L../ccmain + +bin_PROGRAMS = tesseract +tesseract_SOURCES = $(top_srcdir)/api/tesseractmain.cpp +tesseract_LDADD = libtesseract.la diff --git a/api/baseapi.cpp b/api/baseapi.cpp index e677e6be3132dc7e6a43f91f55cd532c4799f03a..f6ea857f2f4ea29ef1434d77b02ccb6d092448cd 100644 --- a/api/baseapi.cpp +++ b/api/baseapi.cpp @@ -36,7 +36,6 @@ #include "resultiterator.h" #include "thresholder.h" -#include "tesseractmain.h" #include "tesseractclass.h" #include "pageres.h" #include "tessvars.h" diff --git a/runautoconf b/autogen.sh similarity index 100% rename from runautoconf rename to autogen.sh diff --git a/ccmain/Makefile.am b/ccmain/Makefile.am index 4c9409854aa4c6e5fdc9226e5270bf1629415d36..9d7326cc89d1dde9a31aecf4b7135f9868a728f1 100644 --- a/ccmain/Makefile.am +++ b/ccmain/Makefile.am @@ -3,8 +3,7 @@ AM_CPPFLAGS = \ -DUSE_STD_NAMESPACE \ -I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct \ -I$(top_srcdir)/image -I$(top_srcdir)/viewer \ - -I$(top_srcdir)/ccops -I$(top_srcdir)/dict \ - -I$(top_srcdir)/classify \ + -I$(top_srcdir)/classify -I$(top_srcdir)/dict \ -I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil \ -I$(top_srcdir)/neural_networks/runtime -I$(top_srcdir)/cube \ -I$(top_srcdir)/textord @@ -24,6 +23,17 @@ noinst_LTLIBRARIES = libtesseract_main.la else lib_LTLIBRARIES = libtesseract_main.la libtesseract_main_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_main_la_LIBADD = \ + ../wordrec/libtesseract_wordrec.la \ + ../textord/libtesseract_textord.la \ + ../ccutil/libtesseract_ccutil.la \ + ../ccstruct/libtesseract_ccstruct.la \ + ../viewer/libtesseract_viewer.la \ + ../dict/libtesseract_dict.la \ + ../classify/libtesseract_classify.la \ + ../cutil/libtesseract_cutil.la \ + ../cube/libtesseract_cube.la + endif libtesseract_main_la_SOURCES = \ @@ -36,5 +46,3 @@ libtesseract_main_la_SOURCES = \ tessbox.cpp tessedit.cpp tesseractclass.cpp tessvars.cpp \ tfacepp.cpp thresholder.cpp \ werdit.cpp -libtesseract_main_la_LIBADD = \ - ../wordrec/libtesseract_wordrec.la diff --git a/ccstruct/Makefile.am b/ccstruct/Makefile.am index 48aa7d7abf07493ffd5f775c0dc26996213b388f..9733dd9179cb63191551a50f17c24febfcca0736 100644 --- a/ccstruct/Makefile.am +++ b/ccstruct/Makefile.am @@ -18,6 +18,11 @@ noinst_LTLIBRARIES = libtesseract_ccstruct.la else lib_LTLIBRARIES = libtesseract_ccstruct.la libtesseract_ccstruct_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_ccstruct_la_LIBADD = \ + ../ccutil/libtesseract_ccutil.la \ + ../cutil/libtesseract_cutil.la \ + ../image/libtesseract_image.la \ + ../viewer/libtesseract_viewer.la endif libtesseract_ccstruct_la_SOURCES = \ diff --git a/classify/Makefile.am b/classify/Makefile.am index a8966eabb4f66f12c519ed4d2e3018fca39771db..245713ab978593acc8eedefa57bf2cf53d384ebc 100644 --- a/classify/Makefile.am +++ b/classify/Makefile.am @@ -20,6 +20,13 @@ noinst_LTLIBRARIES = libtesseract_classify.la else lib_LTLIBRARIES = libtesseract_classify.la libtesseract_classify_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_classify_la_LIBADD = \ + ../ccutil/libtesseract_ccutil.la \ + ../cutil/libtesseract_cutil.la \ + ../ccstruct/libtesseract_ccstruct.la \ + ../dict/libtesseract_dict.la \ + ../image/libtesseract_image.la \ + ../viewer/libtesseract_viewer.la endif libtesseract_classify_la_SOURCES = \ diff --git a/configure.ac b/configure.ac index 9fc792189ac210ebc2e2d180664c68f27337787d..af8dbaefc2d023e148ed76ff50a88cba46d81240 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_CANONICAL_HOST # documentation. # TODO(luc) Generate good documentation using doxygen or equivalent PACKAGE_YEAR=2011 -PACKAGE_DATE="08/25" +PACKAGE_DATE="10/16" AC_DEFINE_UNQUOTED(PACKAGE_NAME,["${PACKAGE_NAME}"],[Name of package]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION,["${PACKAGE_VERSION}"],[Version number]) @@ -83,7 +83,17 @@ if test "$enable_graphics" = "no"; then AC_DEFINE([DISABLE_GRAPHICS], [], [Disable graphics]) fi -localedir='${prefix}/share/locale' +# check whether to build multiple libraries +AC_MSG_CHECKING(--enable-multiple-libraries argument) +AC_ARG_ENABLE([multiple-libraries], + [ --enable-multiple-libraries Enable multiple libraries.], + [enable_mlibs=$enableval], + [enable_mlibs="no"]) +AC_MSG_RESULT($enable_mlibs) +AM_CONDITIONAL([USING_MULTIPLELIBS], [test "$enable_mlibs" = "yes"]) + + +#localedir='${prefix}/share/locale' # Not used yet, so disable #AC_ARG_ENABLE([gettext], @@ -100,13 +110,6 @@ localedir='${prefix}/share/locale' #fi #AM_CONDITIONAL([USING_GETTEXT], [test "$enable_gettext" = "yes"]) -AC_ARG_ENABLE([multiple-libraries], - [ --enable-multiple-libraries Enable multiple libraries (default).], - [enable_mlibs=$enableeval], - [enable_mlibs="yes"]) -AC_MSG_RESULT($enable_mlibs) -AM_CONDITIONAL([USING_MULTIPLELIBS], [test "$enable_mlibs" = "yes"]) - # Always look into a "gnu" directory. curwd=`pwd` if test -d $curwd/gnu/include ; then diff --git a/cube/Makefile.am b/cube/Makefile.am index 19130758af1a056691270b4d7fa3b6d288c2201f..522d848e03daaac96ee879d78b8a8059a159f637 100644 --- a/cube/Makefile.am +++ b/cube/Makefile.am @@ -26,6 +26,16 @@ noinst_LTLIBRARIES = libtesseract_cube.la else lib_LTLIBRARIES = libtesseract_cube.la libtesseract_cube_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_cube_la_LIBADD = \ + ../ccstruct/libtesseract_ccstruct.la \ + ../ccutil/libtesseract_ccutil.la \ + ../neural_networks/runtime/libtesseract_neural.la \ + ../image/libtesseract_image.la \ + ../viewer/libtesseract_viewer.la \ + ../wordrec/libtesseract_wordrec.la \ + ../cutil/libtesseract_cutil.la \ + ../classify/libtesseract_classify.la \ + ../dict/libtesseract_dict.la endif libtesseract_cube_la_SOURCES = \ diff --git a/cutil/Makefile.am b/cutil/Makefile.am index c802d3178db4dcd89835f6917f4f785d18991994..fc28be37b24ac534320a37a93ddf9bd50aeee045 100644 --- a/cutil/Makefile.am +++ b/cutil/Makefile.am @@ -11,6 +11,9 @@ noinst_LTLIBRARIES = libtesseract_cutil.la else lib_LTLIBRARIES = libtesseract_cutil.la libtesseract_cutil_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_cutil_la_LIBADD = \ + ../ccutil/libtesseract_ccutil.la \ + ../viewer/libtesseract_viewer.la endif libtesseract_cutil_la_SOURCES = \ diff --git a/dict/Makefile.am b/dict/Makefile.am index 69e3eb4d55d043bf9fd7fadc68fe3be020fa1094..8fef2d37dbcda2f8c0891b490229764cf787992e 100644 --- a/dict/Makefile.am +++ b/dict/Makefile.am @@ -11,6 +11,12 @@ noinst_LTLIBRARIES = libtesseract_dict.la else lib_LTLIBRARIES = libtesseract_dict.la libtesseract_dict_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_dict_la_LIBADD = \ + ../ccutil/libtesseract_ccutil.la \ + ../cutil/libtesseract_cutil.la \ + ../ccstruct/libtesseract_ccstruct.la \ + ../image/libtesseract_image.la \ + ../viewer/libtesseract_viewer.la endif libtesseract_dict_la_SOURCES = \ diff --git a/image/Makefile.am b/image/Makefile.am index b2a5f2ff37c324ff79bfaf7cea672efe075b8a84..a22d8c606e6449aec6422da0f58520e6137c3c11 100644 --- a/image/Makefile.am +++ b/image/Makefile.am @@ -10,6 +10,9 @@ noinst_LTLIBRARIES = libtesseract_image.la else lib_LTLIBRARIES = libtesseract_image.la libtesseract_image_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_image_la_LIBADD = \ + ../ccutil/libtesseract_ccutil.la \ + ../viewer/libtesseract_viewer.la endif libtesseract_image_la_SOURCES = \ diff --git a/tessdata/Makefile.am b/tessdata/Makefile.am index 07b482fda3a9e366593300ff6cd42812ef38f688..b28a2931e50d223896484ca5d5d3518fc92a931d 100644 --- a/tessdata/Makefile.am +++ b/tessdata/Makefile.am @@ -1,6 +1,4 @@ datadir = @datadir@/tessdata -data_DATA = $(wildcard *.traineddata) \ - $(wildcard *.cube.*) - +data_DATA = ./ara.traineddata ./bul.traineddata ./cat.traineddata ./ces.traineddata ./chi_sim.traineddata ./chi_tra.traineddata ./dan-frak.traineddata ./dan.traineddata ./deu-frak.traineddata ./deu.traineddata ./ell.traineddata ./eng.traineddata ./fin.traineddata ./fra.traineddata ./heb.traineddata ./hin.traineddata ./hrv.traineddata ./hun.traineddata ./ind.traineddata ./ita.traineddata ./jpn.traineddata ./kor.traineddata ./lav.traineddata ./lit.traineddata ./nld.traineddata ./nor.traineddata ./osd.traineddata ./pol.traineddata ./por.traineddata ./ron.traineddata ./rus.traineddata ./slk-frak.traineddata ./slk.traineddata ./slv.traineddata ./spa.traineddata ./srp.traineddata ./swe.traineddata ./tgl.traineddata ./tha.traineddata ./tur.traineddata ./ukr.traineddata ./vie.traineddata \ +./ara.cube.bigrams ./ara.cube.fold ./ara.cube.lm ./ara.cube.nn ./ara.cube.params ./ara.cube.size ./ara.cube.word-freq ./eng.cube.bigrams ./eng.cube.fold ./eng.cube.lm ./eng.cube.nn ./eng.cube.params ./eng.cube.size ./eng.cube.word-freq ./hin.cube.bigrams ./hin.cube.fold ./hin.cube.lm ./hin.cube.nn ./hin.cube.params ./hin.cube.word-freq SUBDIRS = configs tessconfigs - diff --git a/textord/Makefile.am b/textord/Makefile.am index 837fb215d7f1fbfc369e1940331f66ec39c256be..4f7ebb89ceaf51cd2081e5168f80f2c0be82f6c4 100644 --- a/textord/Makefile.am +++ b/textord/Makefile.am @@ -22,6 +22,15 @@ noinst_LTLIBRARIES = libtesseract_textord.la else lib_LTLIBRARIES = libtesseract_textord.la libtesseract_textord_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_textord_la_LIBADD = \ + ../ccstruct/libtesseract_ccstruct.la \ + ../ccutil/libtesseract_ccutil.la \ + ../image/libtesseract_image.la \ + ../viewer/libtesseract_viewer.la \ + ../wordrec/libtesseract_wordrec.la \ + ../cutil/libtesseract_cutil.la \ + ../classify/libtesseract_classify.la \ + ../dict/libtesseract_dict.la endif libtesseract_textord_la_SOURCES = \ diff --git a/training/Makefile.am b/training/Makefile.am index 43ef0b8e562a5ad540992e7427164261151643c0..7a171d1228b9d88bff8b0e773c440ae74421db4e 100644 --- a/training/Makefile.am +++ b/training/Makefile.am @@ -2,109 +2,107 @@ SUBDIRS = AM_CPPFLAGS = \ -I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct \ -I$(top_srcdir)/image -I$(top_srcdir)/viewer \ - -I$(top_srcdir)/ccops -I$(top_srcdir)/dict \ + -I$(top_srcdir)/textord -I$(top_srcdir)/dict \ -I$(top_srcdir)/classify -I$(top_srcdir)/display \ - -I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil \ - -I$(top_srcdir)/textord + -I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil include_HEADERS = \ - commontraining.h mergenf.h tessopt.h + commontraining.h tessopt.h mergenf.h -if !USING_MULTIPLELIBS noinst_LTLIBRARIES = libtesseract_training.la libtesseract_tessopt.la -else -lib_LTLIBRARIES = libtesseract_training.la libtesseract_tessopt.la -libtesseract_training_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -libtesseract_tessopt_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) -endif libtesseract_training_la_SOURCES = \ commontraining.cpp +libtesseract_training_la_LDFLAGS = -static libtesseract_tessopt_la_SOURCES = \ tessopt.cpp +libtesseract_tessopt_la_LDFLAGS = -static bin_PROGRAMS = cntraining combine_tessdata mftraining unicharset_extractor wordlist2dawg combine_tessdata_SOURCES = combine_tessdata.cpp if USING_MULTIPLELIBS combine_tessdata_LDADD = \ - ../ccutil/libtesseract_ccutil.la + $(top_srcdir)/ccutil/libtesseract_ccutil.la else combine_tessdata_LDADD = \ - ../libtesseract.la + $(top_srcdir)/api/libtesseract.la endif cntraining_SOURCES = cntraining.cpp -if USING_MULTIPLELIBS cntraining_LDADD = \ libtesseract_training.la \ - libtesseract_tessopt.la \ - ../textord/libtesseract_textord.la \ - ../classify/libtesseract_classify.la \ - ../dict/libtesseract_dict.la \ - ../ccstruct/libtesseract_ccstruct.la \ - ../image/libtesseract_image.la \ - ../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 + libtesseract_tessopt.la +if USING_MULTIPLELIBS +cntraining_LDADD += \ + $(top_srcdir)/textord/libtesseract_textord.la \ + $(top_srcdir)/classify/libtesseract_classify.la \ + $(top_srcdir)/dict/libtesseract_dict.la \ + $(top_srcdir)/ccstruct/libtesseract_ccstruct.la \ + $(top_srcdir)/image/libtesseract_image.la \ + $(top_srcdir)/cutil/libtesseract_cutil.la \ + $(top_srcdir)/viewer/libtesseract_viewer.la \ + $(top_srcdir)/ccmain/libtesseract_main.la \ + $(top_srcdir)/cube/libtesseract_cube.la \ + $(top_srcdir)/neural_networks/runtime/libtesseract_neural.la \ + $(top_srcdir)/wordrec/libtesseract_wordrec.la \ + $(top_srcdir)/ccutil/libtesseract_ccutil.la else -cntraining_LDADD = \ - ../libtesseract.la +cntraining_LDADD += \ + $(top_srcdir)/api/libtesseract.la endif mftraining_SOURCES = mftraining.cpp mergenf.cpp -if USING_MULTIPLELIBS mftraining_LDADD = \ libtesseract_training.la \ - libtesseract_tessopt.la \ - ../textord/libtesseract_textord.la \ - ../classify/libtesseract_classify.la \ - ../dict/libtesseract_dict.la \ - ../ccstruct/libtesseract_ccstruct.la \ - ../image/libtesseract_image.la \ - ../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 + libtesseract_tessopt.la +if USING_MULTIPLELIBS +mftraining_LDADD += \ + $(top_srcdir)/textord/libtesseract_textord.la \ + $(top_srcdir)/classify/libtesseract_classify.la \ + $(top_srcdir)/dict/libtesseract_dict.la \ + $(top_srcdir)/ccstruct/libtesseract_ccstruct.la \ + $(top_srcdir)/image/libtesseract_image.la \ + $(top_srcdir)/cutil/libtesseract_cutil.la \ + $(top_srcdir)/viewer/libtesseract_viewer.la \ + $(top_srcdir)/ccmain/libtesseract_main.la \ + $(top_srcdir)/cube/libtesseract_cube.la \ + $(top_srcdir)/neural_networks/runtime/libtesseract_neural.la \ + $(top_srcdir)/wordrec/libtesseract_wordrec.la \ + $(top_srcdir)/ccutil/libtesseract_ccutil.la else -mftraining_LDADD = \ - ../libtesseract.la +mftraining_LDADD += \ + $(top_srcdir)/api/libtesseract.la endif unicharset_extractor_SOURCES = unicharset_extractor.cpp -if USING_MULTIPLELIBS unicharset_extractor_LDADD = \ - libtesseract_tessopt.la \ - ../ccutil/libtesseract_ccutil.la + libtesseract_tessopt.la +if USING_MULTIPLELIBS +unicharset_extractor_LDADD += \ + $(top_srcdir)/ccutil/libtesseract_ccutil.la else -unicharset_extractor_LDADD = \ - ../libtesseract.la +unicharset_extractor_LDADD += \ + $(top_srcdir)/api/libtesseract.la endif wordlist2dawg_SOURCES = wordlist2dawg.cpp -if USING_MULTIPLELIBS wordlist2dawg_LDADD = \ - libtesseract_tessopt.la \ - ../classify/libtesseract_classify.la \ - ../dict/libtesseract_dict.la \ - ../ccstruct/libtesseract_ccstruct.la \ - ../image/libtesseract_image.la \ - ../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 + libtesseract_tessopt.la +if USING_MULTIPLELIBS +wordlist2dawg_LDADD += \ + $(top_srcdir)/classify/libtesseract_classify.la \ + $(top_srcdir)/dict/libtesseract_dict.la \ + $(top_srcdir)/ccstruct/libtesseract_ccstruct.la \ + $(top_srcdir)/image/libtesseract_image.la \ + $(top_srcdir)/cutil/libtesseract_cutil.la \ + $(top_srcdir)/viewer/libtesseract_viewer.la \ + $(top_srcdir)/ccmain/libtesseract_main.la \ + $(top_srcdir)/cube/libtesseract_cube.la \ + $(top_srcdir)/neural_networks/runtime/libtesseract_neural.la \ + $(top_srcdir)/wordrec/libtesseract_wordrec.la \ + $(top_srcdir)/textord/libtesseract_textord.la \ + $(top_srcdir)/ccutil/libtesseract_ccutil.la else -wordlist2dawg_LDADD = \ - ../libtesseract.la +wordlist2dawg_LDADD += \ + $(top_srcdir)/api/libtesseract.la endif - diff --git a/training/commontraining.cpp b/training/commontraining.cpp index af6547fa9cfca9d9fc4e671dfdf2b2ac56e9d70f..58026bdd0b273d268c121d3729fd61afc1c062e9 100644 --- a/training/commontraining.cpp +++ b/training/commontraining.cpp @@ -18,7 +18,6 @@ #include "mf.h" #include "clusttool.h" #include "cluster.h" -#include "mergenf.h" #include "tessopt.h" #include "featdefs.h" #include "efio.h" diff --git a/wordrec/Makefile.am b/wordrec/Makefile.am index 17f6443d9fcf29402358298ce13f6c40e73c392d..ddf066913224ae51f9c64c85d68b956f1791d65d 100644 --- a/wordrec/Makefile.am +++ b/wordrec/Makefile.am @@ -18,6 +18,14 @@ noinst_LTLIBRARIES = libtesseract_wordrec.la else lib_LTLIBRARIES = libtesseract_wordrec.la libtesseract_wordrec_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) +libtesseract_wordrec_la_LIBADD = \ + ../ccstruct/libtesseract_ccstruct.la \ + ../ccutil/libtesseract_ccutil.la \ + ../cutil/libtesseract_cutil.la \ + ../classify/libtesseract_classify.la \ + ../image/libtesseract_image.la \ + ../dict/libtesseract_dict.la \ + ../viewer/libtesseract_viewer.la endif libtesseract_wordrec_la_SOURCES = \