From c3e6083e424437515dd6b1ba25aa7c77922e8f91 Mon Sep 17 00:00:00 2001 From: amitdo Date: Mon, 23 Apr 2018 13:29:52 +0300 Subject: [PATCH] Remove 'AUTOMAKE_OPTIONS' from all Makefile.am files 'AM_INIT_AUTOMAKE()' in configure.ac sets options globally. --- arch/Makefile.am | 2 +- ccutil/Makefile.am | 1 - lstm/Makefile.am | 2 +- training/Makefile.am | 1 - unittest/Makefile.am | 2 -- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/Makefile.am b/arch/Makefile.am index 734c6e1e..668d11c7 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS += -I$(top_srcdir)/ccstruct -I$(top_srcdir)/ccutil -I$(top_srcdir)/viewer -AUTOMAKE_OPTIONS = subdir-objects + SUBDIRS = AM_CXXFLAGS = diff --git a/ccutil/Makefile.am b/ccutil/Makefile.am index 032df1dc..2ab3248b 100644 --- a/ccutil/Makefile.am +++ b/ccutil/Makefile.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects SUBDIRS = AM_CXXFLAGS = AM_CPPFLAGS = diff --git a/lstm/Makefile.am b/lstm/Makefile.am index a197a8c6..df11b019 100644 --- a/lstm/Makefile.am +++ b/lstm/Makefile.am @@ -2,7 +2,7 @@ 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 -AUTOMAKE_OPTIONS = subdir-objects + SUBDIRS = AM_CXXFLAGS = $(OPENMP_CXXFLAGS) diff --git a/training/Makefile.am b/training/Makefile.am index a37239f8..46824044 100644 --- a/training/Makefile.am +++ b/training/Makefile.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS += \ -DPANGO_ENABLE_ENGINE \ -I$(top_srcdir)/ccmain -I$(top_srcdir)/api \ diff --git a/unittest/Makefile.am b/unittest/Makefile.am index f79b7449..084597d0 100644 --- a/unittest/Makefile.am +++ b/unittest/Makefile.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - # Absolute path of directory 'tessdata' with traineddata files # (must be on same level as top source directory). TESSDATA_DIR=$(shell cd $(top_srcdir) && cd .. && pwd)/tessdata