Merge pull request #1518 from amitdo/subdir-objects

Remove 'AUTOMAKE_OPTIONS' from all Makefile.am files
2024-12-12 07:29:07 +08:00 · 2018-04-23 17:05:07 +03:00 · 2018-04-23 17:05:07 +03:00 · d522655125
commit d522655125
parent c0f9699e9b c3e6083e42
5 changed files with 2 additions and 6 deletions
--- 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 =

--- a/ccutil/Makefile.am
+++ b/ccutil/Makefile.am
@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS =
 AM_CXXFLAGS =
 AM_CPPFLAGS =
--- 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)

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