mirror of
https://github.com/tesseract-ocr/tesseract.git
synced 2024-12-14 16:49:30 +08:00
Merge pull request #1678 from stweil/api
Require tesseract/ for API header files (fixes potential name conflicts)
This commit is contained in:
commit
b1f7990d9b
@ -29,7 +29,7 @@ EXTRA_DIST = README.md\
|
|||||||
DIST_SUBDIRS = $(SUBDIRS) $(TRAINING_SUBDIR)
|
DIST_SUBDIRS = $(SUBDIRS) $(TRAINING_SUBDIR)
|
||||||
|
|
||||||
uninstall-hook:
|
uninstall-hook:
|
||||||
rm -rf $(DESTDIR)$(includedir)
|
rm -rf $(DESTDIR)$(pkgincludedir)
|
||||||
|
|
||||||
dist-hook:
|
dist-hook:
|
||||||
# Need to remove .svn directories from directories
|
# Need to remove .svn directories from directories
|
||||||
|
@ -131,8 +131,6 @@ if $sse41; then
|
|||||||
AM_CONDITIONAL([SSE41_OPT], true)
|
AM_CONDITIONAL([SSE41_OPT], true)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
includedir="${includedir}/tesseract"
|
|
||||||
|
|
||||||
AC_ARG_WITH([extra-includes],
|
AC_ARG_WITH([extra-includes],
|
||||||
[AS_HELP_STRING([--with-extra-includes=DIR],
|
[AS_HELP_STRING([--with-extra-includes=DIR],
|
||||||
[Define an additional directory for include files])],
|
[Define an additional directory for include files])],
|
||||||
|
@ -19,7 +19,7 @@ if VISIBILITY
|
|||||||
AM_CPPFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
|
AM_CPPFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include_HEADERS = apitypes.h baseapi.h capi.h renderer.h tess_version.h
|
pkginclude_HEADERS = apitypes.h baseapi.h capi.h renderer.h tess_version.h
|
||||||
lib_LTLIBRARIES =
|
lib_LTLIBRARIES =
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libtesseract_api.la
|
noinst_LTLIBRARIES = libtesseract_api.la
|
||||||
|
@ -8,7 +8,7 @@ AM_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
|
|||||||
AM_CPPFLAGS += -DTESS_EXPORTS
|
AM_CPPFLAGS += -DTESS_EXPORTS
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include_HEADERS = intsimdmatrix.h
|
pkginclude_HEADERS = intsimdmatrix.h
|
||||||
|
|
||||||
noinst_HEADERS = dotproductavx.h dotproductsse.h
|
noinst_HEADERS = dotproductavx.h dotproductsse.h
|
||||||
noinst_HEADERS += intsimdmatrixavx2.h intsimdmatrixsse.h
|
noinst_HEADERS += intsimdmatrixavx2.h intsimdmatrixsse.h
|
||||||
|
@ -19,7 +19,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
|
|||||||
-fvisibility=hidden -fvisibility-inlines-hidden
|
-fvisibility=hidden -fvisibility-inlines-hidden
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include_HEADERS = \
|
pkginclude_HEADERS = \
|
||||||
thresholder.h ltrresultiterator.h pageiterator.h resultiterator.h \
|
thresholder.h ltrresultiterator.h pageiterator.h resultiterator.h \
|
||||||
osdetect.h
|
osdetect.h
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
|
@ -10,7 +10,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
|
|||||||
-fvisibility=hidden -fvisibility-inlines-hidden
|
-fvisibility=hidden -fvisibility-inlines-hidden
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include_HEADERS = publictypes.h
|
pkginclude_HEADERS = publictypes.h
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
blamer.h blckerr.h blobbox.h blobs.h blread.h boxread.h boxword.h ccstruct.h coutln.h crakedge.h \
|
blamer.h blckerr.h blobbox.h blobs.h blread.h boxread.h boxword.h ccstruct.h coutln.h crakedge.h \
|
||||||
debugpixa.h detlinefit.h dppoint.h fontinfo.h genblob.h hpdsizes.h \
|
debugpixa.h detlinefit.h dppoint.h fontinfo.h genblob.h hpdsizes.h \
|
||||||
|
@ -11,7 +11,7 @@ AM_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
|
|||||||
AM_CPPFLAGS += -DTESS_EXPORTS
|
AM_CPPFLAGS += -DTESS_EXPORTS
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include_HEADERS = \
|
pkginclude_HEADERS = \
|
||||||
basedir.h errcode.h fileerr.h genericvector.h helpers.h host.h memry.h \
|
basedir.h errcode.h fileerr.h genericvector.h helpers.h host.h memry.h \
|
||||||
ndminx.h params.h ocrclass.h platform.h serialis.h strngs.h \
|
ndminx.h params.h ocrclass.h platform.h serialis.h strngs.h \
|
||||||
tesscallback.h unichar.h unicharcompress.h unicharmap.h unicharset.h
|
tesscallback.h unichar.h unicharcompress.h unicharmap.h unicharset.h
|
||||||
|
@ -20,7 +20,7 @@ AM_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
|
|||||||
AM_CPPFLAGS += -DTESS_EXPORTS
|
AM_CPPFLAGS += -DTESS_EXPORTS
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include_HEADERS = \
|
pkginclude_HEADERS = \
|
||||||
convolve.h ctc.h fullyconnected.h functions.h input.h \
|
convolve.h ctc.h fullyconnected.h functions.h input.h \
|
||||||
lstm.h lstmrecognizer.h lstmtrainer.h maxpool.h \
|
lstm.h lstmrecognizer.h lstmtrainer.h maxpool.h \
|
||||||
networkbuilder.h network.h networkio.h networkscratch.h \
|
networkbuilder.h network.h networkio.h networkscratch.h \
|
||||||
|
@ -9,4 +9,4 @@ URL: https://github.com/tesseract-ocr/tesseract
|
|||||||
Version: @tesseract_VERSION@
|
Version: @tesseract_VERSION@
|
||||||
Libs: -L${libdir} -l@tesseract_OUTPUT_NAME@
|
Libs: -L${libdir} -l@tesseract_OUTPUT_NAME@
|
||||||
Libs.private:
|
Libs.private:
|
||||||
Cflags: -I${includedir} -I${includedir}/tesseract
|
Cflags: -I${includedir}
|
||||||
|
Loading…
Reference in New Issue
Block a user