Autotools build: Remove the option 'USING_MULTIPLELIBS'

Libtool's convenience libraries should never be installed. Fixes #985.

api/Makefile.am

@@ -17,28 +17,7 @@ endif
 include_HEADERS = apitypes.h baseapi.h capi.h renderer.h
 lib_LTLIBRARIES = 
 
-if !USING_MULTIPLELIBS
 noinst_LTLIBRARIES = libtesseract_api.la
-else
-lib_LTLIBRARIES += libtesseract_api.la
-libtesseract_api_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-libtesseract_api_la_LIBADD = \
-    ../ccmain/libtesseract_main.la \
-    ../textord/libtesseract_textord.la \
-    ../wordrec/libtesseract_wordrec.la \
-    ../classify/libtesseract_classify.la \
-    ../dict/libtesseract_dict.la \
-    ../arch/libtesseract_arch.la \
-    ../arch/libtesseract_avx.la \
-    ../arch/libtesseract_avx2.la \
-    ../arch/libtesseract_sse.la \
-    ../lstm/libtesseract_lstm.la \
-    ../ccstruct/libtesseract_ccstruct.la \
-    ../cutil/libtesseract_cutil.la \
-    ../viewer/libtesseract_viewer.la \
-    ../ccutil/libtesseract_ccutil.la \
-    ../opencl/libtesseract_opencl.la 
-endif
 
 libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS)
 if VISIBILITY

arch/Makefile.am

@@ -12,17 +12,8 @@ include_HEADERS = dotproductavx.h dotproductsse.h intsimdmatrix.h intsimdmatrixa
 
 noinst_HEADERS =
 
-if !USING_MULTIPLELIBS
 noinst_LTLIBRARIES = libtesseract_avx.la libtesseract_avx2.la libtesseract_sse.la
 noinst_LTLIBRARIES += libtesseract_arch.la
-else
-lib_LTLIBRARIES = libtesseract_avx.la libtesseract_avx2.la libtesseract_sse.la
-lib_LTLIBRARIES += libtesseract_arch.la
-libtesseract_arch_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-libtesseract_avx_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-libtesseract_avx2_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-libtesseract_sse_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-endif
 
 if AVX_OPT
 libtesseract_avx_la_CXXFLAGS = -mavx

ccmain/Makefile.am

@@ -23,25 +23,7 @@ noinst_HEADERS = \
     output.h paragraphs.h paragraphs_internal.h paramsd.h pgedit.h \
     reject.h tessbox.h tessedit.h tesseractclass.h tessvars.h werdit.h
 
-if !USING_MULTIPLELIBS
 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 \
-    ../arch/libtesseract_avx.la \
-    ../arch/libtesseract_sse.la \
-    ../lstm/libtesseract_lstm.la \
-    ../classify/libtesseract_classify.la \
-    ../cutil/libtesseract_cutil.la \
-    ../opencl/libtesseract_opencl.la
-endif
 
 libtesseract_main_la_SOURCES = \
     adaptions.cpp applybox.cpp control.cpp  \

ccstruct/Makefile.am

@@ -22,17 +22,7 @@ noinst_HEADERS = \
     quadlsq.h quadratc.h quspline.h ratngs.h rect.h rejctmap.h \
     seam.h split.h statistc.h stepblob.h vecfuncs.h werd.h
 
-if !USING_MULTIPLELIBS
 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 \
-    ../viewer/libtesseract_viewer.la \
-    ../opencl/libtesseract_opencl.la 
-endif
 
 libtesseract_ccstruct_la_SOURCES = \
     blamer.cpp blobbox.cpp blobs.cpp blread.cpp boxread.cpp boxword.cpp ccstruct.cpp coutln.cpp \

ccutil/Makefile.am

@@ -25,12 +25,7 @@ noinst_HEADERS = \
     scanutils.h tessdatamanager.h tprintf.h unicity_table.h unicodes.h \
     universalambigs.h
 
-if !USING_MULTIPLELIBS
 noinst_LTLIBRARIES = libtesseract_ccutil.la
-else
-lib_LTLIBRARIES = libtesseract_ccutil.la
-libtesseract_ccutil_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-endif
 
 libtesseract_ccutil_la_SOURCES = \
     ambigs.cpp basedir.cpp bits16.cpp bitvector.cpp \

classify/Makefile.am

@@ -21,18 +21,7 @@ noinst_HEADERS = \
     sampleiterator.h shapeclassifier.h shapetable.h \
     tessclassifier.h trainingsample.h trainingsampleset.h
 
-if !USING_MULTIPLELIBS
 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 \
-    ../viewer/libtesseract_viewer.la
-endif
 
 libtesseract_classify_la_SOURCES = \
     adaptive.cpp adaptmatch.cpp blobclass.cpp \

configure.ac

@@ -267,15 +267,6 @@ AC_ARG_ENABLE([visibility],
 AC_MSG_RESULT([$enable_visibility])
 AM_CONDITIONAL([VISIBILITY], [test "$enable_visibility" = "yes"])
 
-# check whether to build multiple libraries
-AC_MSG_CHECKING([--enable-multiple-libraries argument])
-AC_ARG_ENABLE([multiple-libraries],
-    [AS_HELP_STRING([--enable-multiple-libraries],[enable multiple libraries (default=no)])],
-    [enable_mlibs=$enableval],
-    [enable_mlibs="no"])
-AC_MSG_RESULT([$enable_mlibs])
-AM_CONDITIONAL([USING_MULTIPLELIBS], [test "$enable_mlibs" = "yes"])
-
 # Check if tessdata-prefix is disabled
 AC_MSG_CHECKING([whether to use tessdata-prefix])
 AC_ARG_ENABLE([tessdata-prefix],

cutil/Makefile.am

@@ -10,15 +10,7 @@ noinst_HEADERS = \
     emalloc.h globals.h \
     oldlist.h structures.h
 
-if !USING_MULTIPLELIBS
 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 = \
     bitvec.cpp callcpp.cpp cutil.cpp cutil_class.cpp danerror.cpp efio.cpp \

dict/Makefile.am

@@ -10,17 +10,7 @@ noinst_HEADERS = \
     dawg.h dawg_cache.h dict.h matchdefs.h \
     stopper.h trie.h
 
-if !USING_MULTIPLELIBS
 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 \
-    ../viewer/libtesseract_viewer.la
-endif
 
 libtesseract_dict_la_SOURCES = \
     context.cpp \

lstm/Makefile.am

@@ -24,12 +24,7 @@ include_HEADERS = \
 
 noinst_HEADERS = 
 
-if !USING_MULTIPLELIBS
 noinst_LTLIBRARIES = libtesseract_lstm.la
-else
-lib_LTLIBRARIES = libtesseract_lstm.la
-libtesseract_lstm_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-endif
 
 libtesseract_lstm_la_SOURCES = \
 	convolve.cpp ctc.cpp fullyconnected.cpp functions.cpp input.cpp \

opencl/Makefile.am

@@ -2,15 +2,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct -I$(top_srcdir)/c
 noinst_HEADERS = \
     openclwrapper.h oclkernels.h opencl_device_selection.h 
 
-if !USING_MULTIPLELIBS
 noinst_LTLIBRARIES = libtesseract_opencl.la
-else
-lib_LTLIBRARIES = libtesseract_opencl.la
-libtesseract_opencl_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) $(OPENCL_LDFLAGS)
-libtesseract_opencl_la_LIBADD = \
-    ../ccutil/libtesseract_ccutil.la \
-    ../viewer/libtesseract_viewer.la
-endif
 
 libtesseract_opencl_la_SOURCES = \
     openclwrapper.cpp

textord/Makefile.am

@@ -27,21 +27,7 @@ noinst_HEADERS = \
     topitch.h tordmain.h tovars.h \
     underlin.h wordseg.h workingpartset.h
 
-if !USING_MULTIPLELIBS
 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 \
-    ../viewer/libtesseract_viewer.la \
-    ../wordrec/libtesseract_wordrec.la \
-    ../cutil/libtesseract_cutil.la \
-    ../classify/libtesseract_classify.la \
-    ../dict/libtesseract_dict.la \
-    ../opencl/libtesseract_opencl.la 
-endif
 
 libtesseract_textord_la_SOURCES = \
     alignedblob.cpp baselinedetect.cpp bbgrid.cpp blkocc.cpp blobgrid.cpp \