aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 06:50:35 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 06:50:35 +0000
commit00f59eaf5495afd04737ecede784ecba206c1ba2 (patch)
tree2fea7ebae030d2d0cc8def5ed72bfb0743286d3b
parentf9a0bbab90955ea9c0aae286789423e4a19f8c78 (diff)
downloadefl-00f59eaf5495afd04737ecede784ecba206c1ba2.tar.gz
efl-00f59eaf5495afd04737ecede784ecba206c1ba2.tar.xz
efl-00f59eaf5495afd04737ecede784ecba206c1ba2.zip
turn on automake warnings and fix them.
using their recommended way to implement silent rules. SVN revision: 82686
-rw-r--r--configure.ac7
-rw-r--r--data/Makefile.am9
-rw-r--r--src/Makefile_Edje.am9
-rw-r--r--src/examples/edje/Makefile.am13
-rw-r--r--src/examples/evas/Makefile.am9
5 files changed, 24 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac
index a6299b5c9..a8c6c9662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ m4_define([lt_rev], v_mic)
m4_define([lt_age], v_min)
AC_INIT([efl], [efl_version], [enlightenment-devel@lists.sourceforge.net])
-AC_PREREQ([2.59])
+AC_PREREQ([2.60])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
@@ -37,7 +37,7 @@ AH_BOTTOM([
AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([1.6 dist-bzip2 -Wall])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
@@ -232,6 +232,7 @@ AM_CONDITIONAL([HAVE_PS3], [test "x${have_ps3}" = "xyes"])
if test "x${have_windows}" = "xyes" ; then
lt_cv_deplibs_check_method='pass_all'
fi
+AM_PROG_AR
LT_INIT([win32-dll disable-static pic-only])
EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel"
AC_SUBST(EFL_LTLIBRARY_FLAGS)
@@ -296,7 +297,7 @@ AC_PROG_CC_C99
AM_PROG_CC_C_O
if test "x${ac_cv_prog_cc_c99}" = "xno" ; then
- AC_MSG_ERROR([ecore requires a c99-capable compiler])
+ AC_MSG_ERROR([efl requires a c99-capable compiler])
fi
have_gnu_objc=${ac_cv_objc_compiler_gnu}
diff --git a/data/Makefile.am b/data/Makefile.am
index be0a463aa..e00b0512e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -62,12 +62,13 @@ edje/vim/syntax/embryo.vim
# Helper for people using EDJ
EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
-EDJE_CC_FLAGS_VERBOSE_0 =
+EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
+EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
EDJE_CC_FLAGS_VERBOSE_1 = -v
-EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V))
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
-AM_V_EDJ = $(am__v_EDJ_$(V))
-am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
+AM_V_EDJ = $(am__v_EDJ_@AM_V@)
+am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
am__v_EDJ_0 = @echo " EDJ " $@;
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 199f0d8bd..ce31a03d9 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -261,10 +261,11 @@ endif
# Useful to other modules that generate EDJ
EDJE_CC = EFL_RUN_IN_TREE=1 $(builddir)/bin/edje/edje_cc
-EDJE_CC_FLAGS_VERBOSE_0 =
+EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
+EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
EDJE_CC_FLAGS_VERBOSE_1 = -v
-EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir)
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
-AM_V_EDJ = $(am__v_EDJ_$(V))
-am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
+AM_V_EDJ = $(am__v_EDJ_@AM_V@)
+am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
am__v_EDJ_0 = @echo " EDJ " $@;
diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am
index 518e2eb5e..bf4fd3110 100644
--- a/src/examples/edje/Makefile.am
+++ b/src/examples/edje/Makefile.am
@@ -1,21 +1,18 @@
MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
-EDJE_CC_FLAGS_VERBOSE_0 =
+EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
+EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
EDJE_CC_FLAGS_VERBOSE_1 = -v
-EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir)
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
-AM_V_EDJ = $(am__v_EDJ_$(V))
-am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
+AM_V_EDJ = $(am__v_EDJ_@AM_V@)
+am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
am__v_EDJ_0 = @echo " EDJ " $@;
EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen
EDJE_CODEGEN_FLAGS = --prefix=codegen_example
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo " GEN " $@;
-
if ENABLE_MULTISENSE
SND_DIR = -sd $(srcdir)
endif
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index 7557e40e6..85ee91e27 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -1,12 +1,13 @@
MAINTAINERCLEANFILES = Makefile.in
EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
-EDJE_CC_FLAGS_VERBOSE_0 =
+EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
+EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
EDJE_CC_FLAGS_VERBOSE_1 = -v
-EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir)
+EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
-AM_V_EDJ = $(am__v_EDJ_$(V))
-am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
+AM_V_EDJ = $(am__v_EDJ_@AM_V@)
+am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
am__v_EDJ_0 = @echo " EDJ " $@;
AM_CPPFLAGS = \