Remove 'AUTOMAKE_OPTIONS' from all Makefile.am files

amitdo · amitdo · commit c3e6083e4244 · 2018-04-23T14:01:16.000+03:00
'AM_INIT_AUTOMAKE()' in configure.ac sets options globally.
diff --git 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
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS =
 AM_CXXFLAGS =
 AM_CPPFLAGS =
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-AUTOMAKE_OPTIONS = subdir-objects`
`2`	`1`	`SUBDIRS =`
`3`	`2`	`AM_CXXFLAGS =`
`4`	`3`	`AM_CPPFLAGS =`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-AUTOMAKE_OPTIONS = subdir-objects`
`2`	`1`	`AM_CPPFLAGS += \`
`3`	`2`	`-DPANGO_ENABLE_ENGINE \`
`4`	`3`	`-I$(top_srcdir)/ccmain -I$(top_srcdir)/api \`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-AUTOMAKE_OPTIONS = subdir-objects`
`2`		`-`
`3`	`1`	`# Absolute path of directory 'tessdata' with traineddata files`
`4`	`2`	`# (must be on same level as top source directory).`
`5`	`3`	`TESSDATA_DIR=$(shell cd $(top_srcdir) && cd .. && pwd)/tessdata`