Partial fix for autotools configuration after source tree reorganisation

This should fix "make" and "make training".
Signed-off-by: NStefan Weil <sw@weilnetz.de>

Makefile.am

@@ -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 \

src/api/Makefile.am

-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)
 

src/arch/Makefile.am

-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 =

src/ccmain/Makefile.am

 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)

src/ccstruct/Makefile.am

 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

src/classify/Makefile.am

 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 \

src/cutil/Makefile.am

-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 \

src/dict/Makefile.am

-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 \

src/lstm/Makefile.am

 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)

src/opencl/Makefile.am

-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
 

src/textord/Makefile.am

 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)
         

src/training/Makefile.am

 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
 

src/viewer/Makefile.am

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

src/wordrec/Makefile.am

 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 \