summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 a6299b5..a8c6c96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ m4_define([lt_rev], v_mic)
22m4_define([lt_age], v_min) 22m4_define([lt_age], v_min)
23 23
24AC_INIT([efl], [efl_version], [enlightenment-devel@lists.sourceforge.net]) 24AC_INIT([efl], [efl_version], [enlightenment-devel@lists.sourceforge.net])
25AC_PREREQ([2.59]) 25AC_PREREQ([2.60])
26AC_CONFIG_SRCDIR([configure.ac]) 26AC_CONFIG_SRCDIR([configure.ac])
27AC_CONFIG_MACRO_DIR([m4]) 27AC_CONFIG_MACRO_DIR([m4])
28 28
@@ -37,7 +37,7 @@ AH_BOTTOM([
37 37
38AC_USE_SYSTEM_EXTENSIONS 38AC_USE_SYSTEM_EXTENSIONS
39 39
40AM_INIT_AUTOMAKE([1.6 dist-bzip2]) 40AM_INIT_AUTOMAKE([1.6 dist-bzip2 -Wall])
41m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 41m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
42 42
43m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) 43m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
@@ -232,6 +232,7 @@ AM_CONDITIONAL([HAVE_PS3], [test "x${have_ps3}" = "xyes"])
232if test "x${have_windows}" = "xyes" ; then 232if test "x${have_windows}" = "xyes" ; then
233 lt_cv_deplibs_check_method='pass_all' 233 lt_cv_deplibs_check_method='pass_all'
234fi 234fi
235AM_PROG_AR
235LT_INIT([win32-dll disable-static pic-only]) 236LT_INIT([win32-dll disable-static pic-only])
236EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel" 237EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel"
237AC_SUBST(EFL_LTLIBRARY_FLAGS) 238AC_SUBST(EFL_LTLIBRARY_FLAGS)
@@ -296,7 +297,7 @@ AC_PROG_CC_C99
296AM_PROG_CC_C_O 297AM_PROG_CC_C_O
297 298
298if test "x${ac_cv_prog_cc_c99}" = "xno" ; then 299if test "x${ac_cv_prog_cc_c99}" = "xno" ; then
299 AC_MSG_ERROR([ecore requires a c99-capable compiler]) 300 AC_MSG_ERROR([efl requires a c99-capable compiler])
300fi 301fi
301 302
302have_gnu_objc=${ac_cv_objc_compiler_gnu} 303have_gnu_objc=${ac_cv_objc_compiler_gnu}
diff --git a/data/Makefile.am b/data/Makefile.am
index be0a463..e00b051 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -62,12 +62,13 @@ edje/vim/syntax/embryo.vim
62 62
63# Helper for people using EDJ 63# Helper for people using EDJ
64EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc 64EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
65EDJE_CC_FLAGS_VERBOSE_0 = 65EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
66EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
66EDJE_CC_FLAGS_VERBOSE_1 = -v 67EDJE_CC_FLAGS_VERBOSE_1 = -v
67EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) 68EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
68 69
69AM_V_EDJ = $(am__v_EDJ_$(V)) 70AM_V_EDJ = $(am__v_EDJ_@AM_V@)
70am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY)) 71am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
71am__v_EDJ_0 = @echo " EDJ " $@; 72am__v_EDJ_0 = @echo " EDJ " $@;
72 73
73 74
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 199f0d8..ce31a03 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -261,10 +261,11 @@ endif
261 261
262# Useful to other modules that generate EDJ 262# Useful to other modules that generate EDJ
263EDJE_CC = EFL_RUN_IN_TREE=1 $(builddir)/bin/edje/edje_cc 263EDJE_CC = EFL_RUN_IN_TREE=1 $(builddir)/bin/edje/edje_cc
264EDJE_CC_FLAGS_VERBOSE_0 = 264EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
265EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
265EDJE_CC_FLAGS_VERBOSE_1 = -v 266EDJE_CC_FLAGS_VERBOSE_1 = -v
266EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir) 267EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
267 268
268AM_V_EDJ = $(am__v_EDJ_$(V)) 269AM_V_EDJ = $(am__v_EDJ_@AM_V@)
269am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY)) 270am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
270am__v_EDJ_0 = @echo " EDJ " $@; 271am__v_EDJ_0 = @echo " EDJ " $@;
diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am
index 518e2eb..bf4fd31 100644
--- a/src/examples/edje/Makefile.am
+++ b/src/examples/edje/Makefile.am
@@ -1,21 +1,18 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc 3EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
4EDJE_CC_FLAGS_VERBOSE_0 = 4EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
5EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
5EDJE_CC_FLAGS_VERBOSE_1 = -v 6EDJE_CC_FLAGS_VERBOSE_1 = -v
6EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir) 7EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
7 8
8AM_V_EDJ = $(am__v_EDJ_$(V)) 9AM_V_EDJ = $(am__v_EDJ_@AM_V@)
9am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY)) 10am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
10am__v_EDJ_0 = @echo " EDJ " $@; 11am__v_EDJ_0 = @echo " EDJ " $@;
11 12
12EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen 13EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen
13EDJE_CODEGEN_FLAGS = --prefix=codegen_example 14EDJE_CODEGEN_FLAGS = --prefix=codegen_example
14 15
15AM_V_GEN = $(am__v_GEN_$(V))
16am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
17am__v_GEN_0 = @echo " GEN " $@;
18
19if ENABLE_MULTISENSE 16if ENABLE_MULTISENSE
20SND_DIR = -sd $(srcdir) 17SND_DIR = -sd $(srcdir)
21endif 18endif
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index 7557e40..85ee91e 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -1,12 +1,13 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc 3EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
4EDJE_CC_FLAGS_VERBOSE_0 = 4EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
5EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
5EDJE_CC_FLAGS_VERBOSE_1 = -v 6EDJE_CC_FLAGS_VERBOSE_1 = -v
6EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir) 7EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
7 8
8AM_V_EDJ = $(am__v_EDJ_$(V)) 9AM_V_EDJ = $(am__v_EDJ_@AM_V@)
9am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY)) 10am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
10am__v_EDJ_0 = @echo " EDJ " $@; 11am__v_EDJ_0 = @echo " EDJ " $@;
11 12
12AM_CPPFLAGS = \ 13AM_CPPFLAGS = \