Skip to content

Commit a905548

Browse files
amitdoamitdo
committed
Autotools build: Remove the option 'USING_MULTIPLELIBS'
Libtool's convenience libraries should never be installed. Fixes #985.
1 parent dd422c3 commit a905548

File tree

16 files changed

+0
-356
lines changed

16 files changed

+0
-356
lines changed

‎api/Makefile.am

-21
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,7 @@ endif
1717
include_HEADERS = apitypes.h baseapi.h capi.h renderer.h
1818
lib_LTLIBRARIES =
1919

20-
if !USING_MULTIPLELIBS
2120
noinst_LTLIBRARIES = libtesseract_api.la
22-
else
23-
lib_LTLIBRARIES += libtesseract_api.la
24-
libtesseract_api_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
25-
libtesseract_api_la_LIBADD = \
26-
../ccmain/libtesseract_main.la \
27-
../textord/libtesseract_textord.la \
28-
../wordrec/libtesseract_wordrec.la \
29-
../classify/libtesseract_classify.la \
30-
../dict/libtesseract_dict.la \
31-
../arch/libtesseract_arch.la \
32-
../arch/libtesseract_avx.la \
33-
../arch/libtesseract_avx2.la \
34-
../arch/libtesseract_sse.la \
35-
../lstm/libtesseract_lstm.la \
36-
../ccstruct/libtesseract_ccstruct.la \
37-
../cutil/libtesseract_cutil.la \
38-
../viewer/libtesseract_viewer.la \
39-
../ccutil/libtesseract_ccutil.la \
40-
../opencl/libtesseract_opencl.la
41-
endif
4221

4322
libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS)
4423
if VISIBILITY

‎arch/Makefile.am

-9
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,8 @@ include_HEADERS = dotproductavx.h dotproductsse.h intsimdmatrix.h intsimdmatrixa
1212

1313
noinst_HEADERS =
1414

15-
if !USING_MULTIPLELIBS
1615
noinst_LTLIBRARIES = libtesseract_avx.la libtesseract_avx2.la libtesseract_sse.la
1716
noinst_LTLIBRARIES += libtesseract_arch.la
18-
else
19-
lib_LTLIBRARIES = libtesseract_avx.la libtesseract_avx2.la libtesseract_sse.la
20-
lib_LTLIBRARIES += libtesseract_arch.la
21-
libtesseract_arch_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
22-
libtesseract_avx_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
23-
libtesseract_avx2_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
24-
libtesseract_sse_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
25-
endif
2617

2718
if AVX_OPT
2819
libtesseract_avx_la_CXXFLAGS = -mavx

‎ccmain/Makefile.am

-18
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,7 @@ noinst_HEADERS = \
2323
output.h paragraphs.h paragraphs_internal.h paramsd.h pgedit.h \
2424
reject.h tessbox.h tessedit.h tesseractclass.h tessvars.h werdit.h
2525

26-
if !USING_MULTIPLELIBS
2726
noinst_LTLIBRARIES = libtesseract_main.la
28-
else
29-
lib_LTLIBRARIES = libtesseract_main.la
30-
libtesseract_main_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
31-
libtesseract_main_la_LIBADD = \
32-
../wordrec/libtesseract_wordrec.la \
33-
../textord/libtesseract_textord.la \
34-
../ccutil/libtesseract_ccutil.la \
35-
../ccstruct/libtesseract_ccstruct.la \
36-
../viewer/libtesseract_viewer.la \
37-
../dict/libtesseract_dict.la \
38-
../arch/libtesseract_avx.la \
39-
../arch/libtesseract_sse.la \
40-
../lstm/libtesseract_lstm.la \
41-
../classify/libtesseract_classify.la \
42-
../cutil/libtesseract_cutil.la \
43-
../opencl/libtesseract_opencl.la
44-
endif
4527

4628
libtesseract_main_la_SOURCES = \
4729
adaptions.cpp applybox.cpp control.cpp \

‎ccstruct/Makefile.am

-10
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,7 @@ noinst_HEADERS = \
2222
quadlsq.h quadratc.h quspline.h ratngs.h rect.h rejctmap.h \
2323
seam.h split.h statistc.h stepblob.h vecfuncs.h werd.h
2424

25-
if !USING_MULTIPLELIBS
2625
noinst_LTLIBRARIES = libtesseract_ccstruct.la
27-
else
28-
lib_LTLIBRARIES = libtesseract_ccstruct.la
29-
libtesseract_ccstruct_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
30-
libtesseract_ccstruct_la_LIBADD = \
31-
../ccutil/libtesseract_ccutil.la \
32-
../cutil/libtesseract_cutil.la \
33-
../viewer/libtesseract_viewer.la \
34-
../opencl/libtesseract_opencl.la
35-
endif
3626

3727
libtesseract_ccstruct_la_SOURCES = \
3828
blamer.cpp blobbox.cpp blobs.cpp blread.cpp boxread.cpp boxword.cpp ccstruct.cpp coutln.cpp \

‎ccutil/Makefile.am

-5
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ noinst_HEADERS = \
2525
scanutils.h tessdatamanager.h tprintf.h unicity_table.h unicodes.h \
2626
universalambigs.h
2727

28-
if !USING_MULTIPLELIBS
2928
noinst_LTLIBRARIES = libtesseract_ccutil.la
30-
else
31-
lib_LTLIBRARIES = libtesseract_ccutil.la
32-
libtesseract_ccutil_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
33-
endif
3429

3530
libtesseract_ccutil_la_SOURCES = \
3631
ambigs.cpp basedir.cpp bits16.cpp bitvector.cpp \

‎classify/Makefile.am

-11
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,7 @@ noinst_HEADERS = \
2121
sampleiterator.h shapeclassifier.h shapetable.h \
2222
tessclassifier.h trainingsample.h trainingsampleset.h
2323

24-
if !USING_MULTIPLELIBS
2524
noinst_LTLIBRARIES = libtesseract_classify.la
26-
else
27-
lib_LTLIBRARIES = libtesseract_classify.la
28-
libtesseract_classify_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
29-
libtesseract_classify_la_LIBADD = \
30-
../ccutil/libtesseract_ccutil.la \
31-
../cutil/libtesseract_cutil.la \
32-
../ccstruct/libtesseract_ccstruct.la \
33-
../dict/libtesseract_dict.la \
34-
../viewer/libtesseract_viewer.la
35-
endif
3625

3726
libtesseract_classify_la_SOURCES = \
3827
adaptive.cpp adaptmatch.cpp blobclass.cpp \

‎configure.ac

-9
Original file line numberDiff line numberDiff line change
@@ -267,15 +267,6 @@ AC_ARG_ENABLE([visibility],
267267
AC_MSG_RESULT([$enable_visibility])
268268
AM_CONDITIONAL([VISIBILITY], [test "$enable_visibility" = "yes"])
269269

270-
# check whether to build multiple libraries
271-
AC_MSG_CHECKING([--enable-multiple-libraries argument])
272-
AC_ARG_ENABLE([multiple-libraries],
273-
[AS_HELP_STRING([--enable-multiple-libraries],[enable multiple libraries (default=no)])],
274-
[enable_mlibs=$enableval],
275-
[enable_mlibs="no"])
276-
AC_MSG_RESULT([$enable_mlibs])
277-
AM_CONDITIONAL([USING_MULTIPLELIBS], [test "$enable_mlibs" = "yes"])
278-
279270
# Check if tessdata-prefix is disabled
280271
AC_MSG_CHECKING([whether to use tessdata-prefix])
281272
AC_ARG_ENABLE([tessdata-prefix],

‎cutil/Makefile.am

-8
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@ noinst_HEADERS = \
1010
emalloc.h globals.h \
1111
oldlist.h structures.h
1212

13-
if !USING_MULTIPLELIBS
1413
noinst_LTLIBRARIES = libtesseract_cutil.la
15-
else
16-
lib_LTLIBRARIES = libtesseract_cutil.la
17-
libtesseract_cutil_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
18-
libtesseract_cutil_la_LIBADD = \
19-
../ccutil/libtesseract_ccutil.la \
20-
../viewer/libtesseract_viewer.la
21-
endif
2214

2315
libtesseract_cutil_la_SOURCES = \
2416
bitvec.cpp callcpp.cpp cutil.cpp cutil_class.cpp danerror.cpp efio.cpp \

‎dict/Makefile.am

-10
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,7 @@ noinst_HEADERS = \
1010
dawg.h dawg_cache.h dict.h matchdefs.h \
1111
stopper.h trie.h
1212

13-
if !USING_MULTIPLELIBS
1413
noinst_LTLIBRARIES = libtesseract_dict.la
15-
else
16-
lib_LTLIBRARIES = libtesseract_dict.la
17-
libtesseract_dict_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
18-
libtesseract_dict_la_LIBADD = \
19-
../ccutil/libtesseract_ccutil.la \
20-
../cutil/libtesseract_cutil.la \
21-
../ccstruct/libtesseract_ccstruct.la \
22-
../viewer/libtesseract_viewer.la
23-
endif
2414

2515
libtesseract_dict_la_SOURCES = \
2616
context.cpp \

‎lstm/Makefile.am

-5
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@ include_HEADERS = \
2424

2525
noinst_HEADERS =
2626

27-
if !USING_MULTIPLELIBS
2827
noinst_LTLIBRARIES = libtesseract_lstm.la
29-
else
30-
lib_LTLIBRARIES = libtesseract_lstm.la
31-
libtesseract_lstm_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
32-
endif
3328

3429
libtesseract_lstm_la_SOURCES = \
3530
convolve.cpp ctc.cpp fullyconnected.cpp functions.cpp input.cpp \

‎opencl/Makefile.am

-8
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct -I$(top_srcdir)/c
22
noinst_HEADERS = \
33
openclwrapper.h oclkernels.h opencl_device_selection.h
44

5-
if !USING_MULTIPLELIBS
65
noinst_LTLIBRARIES = libtesseract_opencl.la
7-
else
8-
lib_LTLIBRARIES = libtesseract_opencl.la
9-
libtesseract_opencl_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) $(OPENCL_LDFLAGS)
10-
libtesseract_opencl_la_LIBADD = \
11-
../ccutil/libtesseract_ccutil.la \
12-
../viewer/libtesseract_viewer.la
13-
endif
146

157
libtesseract_opencl_la_SOURCES = \
168
openclwrapper.cpp

‎textord/Makefile.am

-14
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,7 @@ noinst_HEADERS = \
2727
topitch.h tordmain.h tovars.h \
2828
underlin.h wordseg.h workingpartset.h
2929

30-
if !USING_MULTIPLELIBS
3130
noinst_LTLIBRARIES = libtesseract_textord.la
32-
else
33-
lib_LTLIBRARIES = libtesseract_textord.la
34-
libtesseract_textord_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
35-
libtesseract_textord_la_LIBADD = \
36-
../ccstruct/libtesseract_ccstruct.la \
37-
../ccutil/libtesseract_ccutil.la \
38-
../viewer/libtesseract_viewer.la \
39-
../wordrec/libtesseract_wordrec.la \
40-
../cutil/libtesseract_cutil.la \
41-
../classify/libtesseract_classify.la \
42-
../dict/libtesseract_dict.la \
43-
../opencl/libtesseract_opencl.la
44-
endif
4531

4632
libtesseract_textord_la_SOURCES = \
4733
alignedblob.cpp baselinedetect.cpp bbgrid.cpp blkocc.cpp blobgrid.cpp \

0 commit comments

Comments
 (0)