Fix autotools build

karama300 · Oct 28, 2019 · 2f8884a · 2f8884a
1 parent e1bae15
commit 2f8884a
Show file tree

Hide file tree

Showing 18 changed files with 82 additions and 23 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -22,7 +22,7 @@ endif
 
 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
+SUBDIRS += src/ccmain src/api . tessdata doc unittest include/tesseract
 
 EXTRA_DIST = README.md LICENSE
 EXTRA_DIST += aclocal.m4 config configure.ac autogen.sh

diff --git a/configure.ac b/configure.ac
@@ -486,9 +486,10 @@ fi
 # ----------------------------------------
 
 # Output files
+AC_CONFIG_FILES([include/tesseract/Makefile])
+AC_CONFIG_FILES([include/tesseract/tess_version.h])
 AC_CONFIG_FILES([Makefile tesseract.pc])
 AC_CONFIG_FILES([src/api/Makefile])
-AC_CONFIG_FILES([src/api/tess_version.h])
 AC_CONFIG_FILES([src/arch/Makefile])
 AC_CONFIG_FILES([src/ccmain/Makefile])
 AC_CONFIG_FILES([src/opencl/Makefile])

diff --git a/include/tesseract/Makefile.am b/include/tesseract/Makefile.am
@@ -0,0 +1,54 @@
+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 \
+  tess_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
+
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
@@ -1,4 +1,6 @@
 AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" \
+    -I$(top_builddir)/include \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/arch \
     -I$(top_srcdir)/src/lstm \
     -I$(top_srcdir)/src/ccutil \
@@ -10,8 +12,7 @@ AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" \
     -I$(top_srcdir)/src/ccmain \
     -I$(top_srcdir)/src/wordrec \
     -I$(top_srcdir)/src/cutil \
-    -I$(top_srcdir)/src/opencl \
-    -I$(top_builddir)/api
+    -I$(top_srcdir)/src/opencl
 
 AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
 
@@ -23,7 +24,6 @@ if VISIBILITY
 AM_CPPFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-pkginclude_HEADERS = apitypes.h baseapi.h capi.h renderer.h tess_version.h
 lib_LTLIBRARIES =
 
 noinst_LTLIBRARIES = libtesseract_api.la

diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
@@ -1,4 +1,8 @@
-AM_CPPFLAGS += -I$(top_srcdir)/src/ccstruct -I$(top_srcdir)/src/ccutil -I$(top_srcdir)/src/viewer
+AM_CPPFLAGS += \
+  -I$(top_srcdir)/include \
+  -I$(top_srcdir)/src/ccstruct \
+  -I$(top_srcdir)/src/ccutil \
+  -I$(top_srcdir)/src/viewer
 
 AM_CXXFLAGS =
 

diff --git a/src/ccmain/Makefile.am b/src/ccmain/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += \
+  -I$(top_srcdir)/include \
   -I$(top_srcdir)/src/ccutil \
   -I$(top_srcdir)/src/ccstruct \
   -I$(top_srcdir)/src/arch \
@@ -23,13 +24,6 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-pkginclude_HEADERS = \
-    thresholder.h \
-    osdetect.h \
-    ltrresultiterator.h \
-    pageiterator.h \
-    resultiterator.h
-
 noinst_HEADERS = \
     control.h \
     equationdetect.h \

diff --git a/src/ccstruct/Makefile.am b/src/ccstruct/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/cutil \
     -I$(top_srcdir)/src/dict \
@@ -16,7 +17,6 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-pkginclude_HEADERS = publictypes.h
 noinst_HEADERS = \
     blamer.h blobbox.h blobs.h blread.h boxread.h boxword.h \
     ccstruct.h coutln.h crakedge.h \

diff --git a/src/ccutil/Makefile.am b/src/ccutil/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS =
-AM_CPPFLAGS =
+AM_CPPFLAGS += -I$(top_srcdir)/include
 
 if !NO_TESSDATA_PREFIX
 AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@
@@ -14,11 +14,6 @@ if DISABLED_LEGACY_ENGINE
 AM_CPPFLAGS += -DDISABLED_LEGACY_ENGINE
 endif
 
-pkginclude_HEADERS = \
-    genericvector.h helpers.h \
-    ocrclass.h platform.h serialis.h strngs.h \
-    unichar.h
-
 noinst_HEADERS = \
     bits16.h ccutil.h clst.h doubleptr.h elst2.h \
     elst.h errcode.h fileerr.h \

diff --git a/src/classify/Makefile.am b/src/classify/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/cutil \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/ccstruct \

diff --git a/src/cutil/Makefile.am b/src/cutil/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/viewer
 

diff --git a/src/dict/Makefile.am b/src/dict/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/cutil \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/ccstruct \

diff --git a/src/lstm/Makefile.am b/src/lstm/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/cutil \
     -I$(top_srcdir)/src/ccstruct \

diff --git a/src/opencl/Makefile.am b/src/opencl/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += $(OPENCL_CFLAGS) \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/ccstruct \
     -I$(top_srcdir)/src/ccmain

diff --git a/src/textord/Makefile.am b/src/textord/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/ccstruct \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/viewer \

diff --git a/src/training/Makefile.am b/src/training/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS += \
     -DPANGO_ENABLE_ENGINE \
-    -I$(top_builddir)/src/api \
+    -I$(top_builddir)/include \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/api \
     -I$(top_srcdir)/src/ccmain \
     -I$(top_srcdir)/src/ccutil \

diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am
@@ -1,4 +1,6 @@
-AM_CPPFLAGS += -I$(top_srcdir)/src/ccutil
+AM_CPPFLAGS += \
+  -I$(top_srcdir)/include \
+  -I$(top_srcdir)/src/ccutil
 
 if VISIBILITY
 AM_CPPFLAGS += -DTESS_EXPORTS \

diff --git a/src/wordrec/Makefile.am b/src/wordrec/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS += \
+    -I$(top_srcdir)/include \
     -I$(top_srcdir)/src/ccstruct \
     -I$(top_srcdir)/src/ccutil \
     -I$(top_srcdir)/src/cutil \

diff --git a/unittest/Makefile.am b/unittest/Makefile.am
@@ -25,7 +25,8 @@ AM_CPPFLAGS += -DPANGO_ENABLE_ENGINE
 if DISABLED_LEGACY_ENGINE
 AM_CPPFLAGS += -DDISABLED_LEGACY_ENGINE
 endif # DISABLED_LEGACY_ENGINE
-AM_CPPFLAGS += -I$(top_builddir)/src/api
+AM_CPPFLAGS += -I$(top_builddir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/src/api
 AM_CPPFLAGS += -I$(top_srcdir)/src/arch
 AM_CPPFLAGS += -I$(top_srcdir)/src/ccmain