autotools: try to simplify our Makefile.am to reduce warnings.

diff --git a/configure.ac b/configure.ac
index e132b90..ba593c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AH_BOTTOM([
 
 AC_USE_SYSTEM_EXTENSIONS
 
-AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-xz -Wall color-tests])
+AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-xz -Wall color-tests subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 CFOPT_WARNING=""

diff --git a/src/Makefile.am b/src/Makefile.am
index 604ee4c..58b009e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES =
 BUILT_SOURCES =

diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
index a90fe7c..d38b59f 100644 (file)
--- a/src/examples/eo/Makefile.am
+++ b/src/examples/eo/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \

diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am
index 253cd13..72fdbf9 100644 (file)
--- a/src/examples/eolian_cxx/Makefile.am
+++ b/src/examples/eolian_cxx/Makefile.am
@@ -1,6 +1,3 @@
-
-AUTOMAKE_OPTIONS = subdir-objects
-
 MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES =
 

diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index ec4ce88..8ce8cf0 100644 (file)
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 MAINTAINERCLEANFILES = Makefile.in
 
 include ../../Makefile_Edje_Helper.am