Skip to content

Commit

Permalink
automake: Flat build for src/dict
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Weil <sw@weilnetz.de>
  • Loading branch information
stweil committed Nov 26, 2019
1 parent 6181acf commit 7ebcc77
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 33 deletions.
32 changes: 30 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ endif
.PHONY: doc install-langs ScrollView.jar install-jars training

SUBDIRS = src/viewer src/opencl
SUBDIRS += src/dict src/wordrec src/textord src/lstm
SUBDIRS += src/wordrec src/textord src/lstm
SUBDIRS += . tessdata doc unittest

EXTRA_DIST = README.md LICENSE
Expand Down Expand Up @@ -145,12 +145,12 @@ libtesseract_la_LIBADD += libtesseract_ccstruct.la
libtesseract_la_LIBADD += libtesseract_ccutil.la
libtesseract_la_LIBADD += libtesseract_classify.la
libtesseract_la_LIBADD += libtesseract_cutil.la
libtesseract_la_LIBADD += libtesseract_dict.la
libtesseract_la_LIBADD += libtesseract_main.la
libtesseract_la_LIBADD += libtesseract_native.la
libtesseract_la_LIBADD += \
src/textord/libtesseract_textord.la \
src/wordrec/libtesseract_wordrec.la \
src/dict/libtesseract_dict.la \
src/lstm/libtesseract_lstm.la \
src/viewer/libtesseract_viewer.la \
src/opencl/libtesseract_opencl.la
Expand Down Expand Up @@ -562,6 +562,34 @@ libtesseract_cutil_la_SOURCES += src/cutil/emalloc.cpp
libtesseract_cutil_la_SOURCES += src/cutil/oldlist.cpp
endif

# Rules for src/dict.

libtesseract_dict_la_CPPFLAGS = $(AM_CPPFLAGS)
libtesseract_dict_la_CPPFLAGS += -I$(top_srcdir)/src/ccstruct
libtesseract_dict_la_CPPFLAGS += -I$(top_srcdir)/src/ccutil
libtesseract_dict_la_CPPFLAGS += -I$(top_srcdir)/src/cutil
libtesseract_dict_la_CPPFLAGS += -I$(top_srcdir)/src/viewer

noinst_HEADERS += src/dict/dawg.h
noinst_HEADERS += src/dict/dawg_cache.h
noinst_HEADERS += src/dict/dict.h
noinst_HEADERS += src/dict/matchdefs.h
noinst_HEADERS += src/dict/stopper.h
noinst_HEADERS += src/dict/trie.h

noinst_LTLIBRARIES += libtesseract_dict.la

libtesseract_dict_la_SOURCES = src/dict/context.cpp
libtesseract_dict_la_SOURCES += src/dict/dawg.cpp
libtesseract_dict_la_SOURCES += src/dict/dawg_cache.cpp
libtesseract_dict_la_SOURCES += src/dict/dict.cpp
libtesseract_dict_la_SOURCES += src/dict/permdawg.cpp
libtesseract_dict_la_SOURCES += src/dict/stopper.cpp
libtesseract_dict_la_SOURCES += src/dict/trie.cpp
if !DISABLED_LEGACY_ENGINE
libtesseract_dict_la_SOURCES += src/dict/hyphen.cpp
endif

# Rules for tesseract executable.

bin_PROGRAMS = tesseract
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,6 @@ fi
AC_CONFIG_FILES([include/tesseract/version.h])
AC_CONFIG_FILES([Makefile tesseract.pc])
AC_CONFIG_FILES([src/opencl/Makefile])
AC_CONFIG_FILES([src/dict/Makefile])
AC_CONFIG_FILES([src/lstm/Makefile])
AC_CONFIG_FILES([src/textord/Makefile])
AC_CONFIG_FILES([src/viewer/Makefile])
Expand Down
30 changes: 0 additions & 30 deletions src/dict/Makefile.am

This file was deleted.

0 comments on commit 7ebcc77

Please sign in to comment.