Use flat make for include/tesseract

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2019-10-29 12:01:51 +01:00
parent 061eccd6ae
commit 7ef20bb0e6
3 changed files with 20 additions and 56 deletions

View File

@ -22,7 +22,7 @@ endif
SUBDIRS = src/arch src/ccutil src/viewer src/cutil src/opencl src/ccstruct SUBDIRS = src/arch src/ccutil src/viewer src/cutil src/opencl src/ccstruct
SUBDIRS += src/dict src/classify src/wordrec src/textord src/lstm SUBDIRS += src/dict src/classify src/wordrec src/textord src/lstm
SUBDIRS += src/ccmain src/api . tessdata doc unittest include/tesseract SUBDIRS += src/ccmain src/api . tessdata doc unittest
EXTRA_DIST = README.md LICENSE EXTRA_DIST = README.md LICENSE
EXTRA_DIST += aclocal.m4 config configure.ac autogen.sh EXTRA_DIST += aclocal.m4 config configure.ac autogen.sh
@ -65,6 +65,25 @@ doc-clean:
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = tesseract.pc pkgconfig_DATA = tesseract.pc
pkginclude_HEADERS = $(top_builddir)/include/tesseract/version.h
pkginclude_HEADERS += include/tesseract/apitypes.h
pkginclude_HEADERS += include/tesseract/baseapi.h
pkginclude_HEADERS += include/tesseract/capi.h
pkginclude_HEADERS += include/tesseract/genericvector.h
pkginclude_HEADERS += include/tesseract/helpers.h
pkginclude_HEADERS += include/tesseract/ltrresultiterator.h
pkginclude_HEADERS += include/tesseract/ocrclass.h
pkginclude_HEADERS += include/tesseract/osdetect.h
pkginclude_HEADERS += include/tesseract/pageiterator.h
pkginclude_HEADERS += include/tesseract/platform.h
pkginclude_HEADERS += include/tesseract/publictypes.h
pkginclude_HEADERS += include/tesseract/renderer.h
pkginclude_HEADERS += include/tesseract/resultiterator.h
pkginclude_HEADERS += include/tesseract/serialis.h
pkginclude_HEADERS += include/tesseract/strngs.h
pkginclude_HEADERS += include/tesseract/thresholder.h
pkginclude_HEADERS += include/tesseract/unichar.h
# fuzzer-api is used for fuzzing tests. # fuzzer-api is used for fuzzing tests.
# They are run by OSS-Fuzz https://oss-fuzz.com/, but can also be run locally. # They are run by OSS-Fuzz https://oss-fuzz.com/, but can also be run locally.
# Note: -fsanitize=fuzzer currently requires the clang++ compiler. # Note: -fsanitize=fuzzer currently requires the clang++ compiler.

View File

@ -486,7 +486,6 @@ fi
# ---------------------------------------- # ----------------------------------------
# Output files # Output files
AC_CONFIG_FILES([include/tesseract/Makefile])
AC_CONFIG_FILES([include/tesseract/version.h]) AC_CONFIG_FILES([include/tesseract/version.h])
AC_CONFIG_FILES([Makefile tesseract.pc]) AC_CONFIG_FILES([Makefile tesseract.pc])
AC_CONFIG_FILES([src/api/Makefile]) AC_CONFIG_FILES([src/api/Makefile])

View File

@ -1,54 +0,0 @@
AM_CPPFLAGS += \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/api \
-I$(top_srcdir)/src/arch \
-I$(top_srcdir)/src/classify \
-I$(top_srcdir)/src/ccmain \
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/dict \
-I$(top_srcdir)/src/lstm \
-I$(top_srcdir)/src/opencl \
-I$(top_srcdir)/src/textord \
-I$(top_srcdir)/src/viewer \
-I$(top_srcdir)/src/wordrec
if !NO_TESSDATA_PREFIX
AM_CPPFLAGS += -DTESSDATA_PREFIX=@datadir@
endif
if DISABLED_LEGACY_ENGINE
AM_CPPFLAGS += -DDISABLED_LEGACY_ENGINE
endif
if VISIBILITY
AM_CPPFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
endif
pkginclude_HEADERS = \
apitypes.h \
baseapi.h \
capi.h renderer.h \
version.h
pkginclude_HEADERS += \
thresholder.h \
osdetect.h \
ltrresultiterator.h \
pageiterator.h \
resultiterator.h
pkginclude_HEADERS += publictypes.h
pkginclude_HEADERS += \
genericvector.h \
helpers.h \
ocrclass.h \
platform.h \
serialis.h \
strngs.h \
unichar.h