mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-27 12:49:35 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Partial fix for autotools configuration after source tree reorganisation

Browse Source 
This should fix "make" and "make training".

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2018-04-25 20:37:38 +02:00
parent d15558b97a
commit 4f9493c409
14 changed files with 95 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.am
View File

@ -2,15 +2,15 @@
ACLOCAL_AMFLAGS = -I m4
if ENABLE_TRAINING
TRAINING_SUBDIR = training
TRAINING_SUBDIR = src/training
training: all
@$(MAKE) -C training
@$(MAKE) -C src/training
training-install: training
@$(MAKE) -C training install
@$(MAKE) -C src/training install
training-uninstall:
@$(MAKE) -C training uninstall
@$(MAKE) -C src/training uninstall
clean-local:
@$(MAKE) -C training clean
@$(MAKE) -C src/training clean
else
training:
@echo "Need to reconfigure project, so there are no errors"
@ -18,8 +18,9 @@ endif
.PHONY: doc install-langs ScrollView.jar install-jars training
SUBDIRS = arch ccutil viewer cutil opencl ccstruct dict classify wordrec textord lstm
SUBDIRS += ccmain api . tessdata doc unittest
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/ccmain src/api . tessdata doc unittest
EXTRA_DIST = README.md\
aclocal.m4 config configure.ac autogen.sh contrib \

22
src/api/Makefile.am
View File

@ -1,11 +1,17 @@
AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"\
-I$(top_srcdir)/arch -I$(top_srcdir)/lstm \
-I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct \
-I$(top_srcdir)/viewer \
-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)/opencl -I$(top_builddir)/api
AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" \
-I$(top_srcdir)/src/arch \
-I$(top_srcdir)/src/lstm \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/viewer \
-I$(top_srcdir)/src/textord \
-I$(top_srcdir)/src/dict \
-I$(top_srcdir)/src/classify \
-I$(top_srcdir)/src/ccmain \
-I$(top_srcdir)/src/wordrec \
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/opencl \
-I$(top_builddir)/api
AM_CPPFLAGS += $(OPENCL_CPPFLAGS)

2
src/arch/Makefile.am
View File

@ -1,4 +1,4 @@
AM_CPPFLAGS += -I$(top_srcdir)/ccstruct -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer
AM_CPPFLAGS += -I$(top_srcdir)/src/ccstruct -I$(top_srcdir)/src/ccutil -I$(top_srcdir)/src/viewer
SUBDIRS =
AM_CXXFLAGS =

17
src/ccmain/Makefile.am
View File

@ -1,10 +1,15 @@
AM_CPPFLAGS += \
-I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct \
-I$(top_srcdir)/arch -I$(top_srcdir)/lstm \
-I$(top_srcdir)/viewer \
-I$(top_srcdir)/classify -I$(top_srcdir)/dict \
-I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil \
-I$(top_srcdir)/textord -I$(top_srcdir)/opencl
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/arch \
-I$(top_srcdir)/src/lstm \
-I$(top_srcdir)/src/viewer \
-I$(top_srcdir)/src/classify \
-I$(top_srcdir)/src/dict \
-I$(top_srcdir)/src/wordrec \
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/textord \
-I$(top_srcdir)/src/opencl
AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
AM_CPPFLAGS += $(OPENMP_CXXFLAGS)

7
src/ccstruct/Makefile.am
View File

@ -1,7 +1,8 @@
AM_CPPFLAGS += \
-I$(top_srcdir)/ccutil -I$(top_srcdir)/cutil \
-I$(top_srcdir)/viewer \
-I$(top_srcdir)/opencl
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/viewer \
-I$(top_srcdir)/src/opencl
AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
if VISIBILITY

8
src/classify/Makefile.am
View File

@ -1,7 +1,9 @@
AM_CPPFLAGS += \
-I$(top_srcdir)/cutil -I$(top_srcdir)/ccutil \
-I$(top_srcdir)/ccstruct -I$(top_srcdir)/dict \
-I$(top_srcdir)/viewer
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/dict \
-I$(top_srcdir)/src/viewer
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \

4
src/cutil/Makefile.am
View File

@ -1,4 +1,6 @@
AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer
AM_CPPFLAGS += \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/viewer
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \

7
src/dict/Makefile.am
View File

@ -1,5 +1,8 @@
AM_CPPFLAGS += -I$(top_srcdir)/cutil -I$(top_srcdir)/ccutil \
-I$(top_srcdir)/ccstruct -I$(top_srcdir)/viewer
AM_CPPFLAGS += \
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/viewer
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \

11
src/lstm/Makefile.am
View File

@ -1,7 +1,12 @@
AM_CPPFLAGS += \
-I$(top_srcdir)/ccutil -I$(top_srcdir)/cutil -I$(top_srcdir)/ccstruct \
-I$(top_srcdir)/arch -I$(top_srcdir)/viewer -I$(top_srcdir)/classify \
-I$(top_srcdir)/dict -I$(top_srcdir)/lstm
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/arch \
-I$(top_srcdir)/src/viewer \
-I$(top_srcdir)/src/classify \
-I$(top_srcdir)/src/dict \
-I$(top_srcdir)/src/lstm
SUBDIRS =
AM_CXXFLAGS = $(OPENMP_CXXFLAGS)

6
src/opencl/Makefile.am
View File

@ -1,4 +1,8 @@
AM_CPPFLAGS += -I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct -I$(top_srcdir)/ccmain $(OPENCL_CFLAGS)
AM_CPPFLAGS += $(OPENCL_CFLAGS) \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/ccmain
noinst_HEADERS = \
openclwrapper.h oclkernels.h opencl_device_selection.h

15
src/textord/Makefile.am
View File

@ -1,9 +1,14 @@
AM_CPPFLAGS += \
-I$(top_srcdir)/ccstruct -I$(top_srcdir)/ccutil \
-I$(top_srcdir)/viewer \
-I$(top_srcdir)/ccmain -I$(top_srcdir)/wordrec -I$(top_srcdir)/api \
-I$(top_srcdir)/cutil -I$(top_srcdir)/classify -I$(top_srcdir)/dict \
-I$(top_srcdir)/opencl
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/viewer \
-I$(top_srcdir)/src/ccmain \
-I$(top_srcdir)/src/wordrec \
-I$(top_srcdir)/src/api \
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/classify \
-I$(top_srcdir)/src/dict \
-I$(top_srcdir)/src/opencl
AM_CPPFLAGS += $(OPENCL_CPPFLAGS)

22
src/training/Makefile.am
View File

@ -1,13 +1,19 @@
AM_CPPFLAGS += \
-DPANGO_ENABLE_ENGINE \
-I$(top_srcdir)/ccmain -I$(top_srcdir)/api \
-I$(top_srcdir)/ccutil -I$(top_srcdir)/ccstruct \
-I$(top_srcdir)/lstm -I$(top_srcdir)/arch \
-I$(top_srcdir)/viewer \
-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_builddir)/api
-I$(top_builddir)/src/api \
-I$(top_srcdir)/src/api \
-I$(top_srcdir)/src/ccmain \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/lstm \
-I$(top_srcdir)/src/arch \
-I$(top_srcdir)/src/viewer \
-I$(top_srcdir)/src/textord \
-I$(top_srcdir)/src/dict \
-I$(top_srcdir)/src/classify \
-I$(top_srcdir)/src/display \
-I$(top_srcdir)/src/wordrec \
-I$(top_srcdir)/src/cutil
EXTRA_DIST = language-specific.sh tesstrain.sh tesstrain_utils.sh

2
src/viewer/Makefile.am
View File

@ -1,4 +1,4 @@
AM_CPPFLAGS += -I$(top_srcdir)/ccutil
AM_CPPFLAGS += -I$(top_srcdir)/src/ccutil
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \

10
src/wordrec/Makefile.am
View File

@ -1,8 +1,10 @@
AM_CPPFLAGS += \
-I$(top_srcdir)/ccstruct -I$(top_srcdir)/ccutil \
-I$(top_srcdir)/cutil -I$(top_srcdir)/classify \
-I$(top_srcdir)/dict \
-I$(top_srcdir)/viewer
-I$(top_srcdir)/src/ccstruct \
-I$(top_srcdir)/src/ccutil \
-I$(top_srcdir)/src/cutil \
-I$(top_srcdir)/src/classify \
-I$(top_srcdir)/src/dict \
-I$(top_srcdir)/src/viewer
if VISIBILITY
AM_CPPFLAGS += -DTESS_EXPORTS \