autotools: improve build system to be able to correctly pick outside and inside tools.

diff --git a/data/edje_externals/Makefile.am b/data/edje_externals/Makefile.am
index b5762b1..a4ae906 100644 (file)
--- a/data/edje_externals/Makefile.am
+++ b/data/edje_externals/Makefile.am
@@ -1,11 +1,9 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
 
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals
+include ../../Makefile_Elm_Helpers.am
+
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals
 
 filesdir = $(datadir)/elementary/edje_externals
 files_DATA = icons.edj
@@ -36,7 +34,7 @@ ico_thumb.png \
 ico_toolbar.png
 
 icons.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/edje_externals/icons.edc \
        $(top_builddir)/data/edje_externals/icons.edj
 

diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am
index 88c4f1a..f18e347 100644 (file)
--- a/data/objects/Makefile.am
+++ b/data/objects/Makefile.am
@@ -1,18 +1,14 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
 
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
+include ../../Makefile_Elm_Helpers.am
+
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
 
 filesdir = $(datadir)/elementary/objects
 
 files_DATA = test.edj test_external.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_custom.edj
 
-ELM_PREFS_CC = @elm_prefs_cc@
-
 EXTRA_DIST = \
 test.edc \
 test_external.edc \
@@ -37,46 +33,46 @@ border5.png \
 border6.png
 
 test.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/test.edc \
        $(top_builddir)/data/objects/test.edj
 
 test_external.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/test_external.edc \
        $(top_builddir)/data/objects/test_external.edj
 
 multip.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/multip.edc \
        $(top_builddir)/data/objects/multip.edj
 
 colorpreview.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/colorpreview.edc \
        $(top_builddir)/data/objects/colorpreview.edj
 
 cursors.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/cursors.edc \
        $(top_builddir)/data/objects/cursors.edj
 
 font_preview.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/font_preview.edc \
        $(top_builddir)/data/objects/font_preview.edj
 
 postit_ent.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/postit_ent.edc \
        $(top_builddir)/data/objects/postit_ent.edj
 multibuttonentry.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/multibuttonentry.edc \
        $(top_builddir)/data/objects/multibuttonentry.edj
 
 test_prefs.edj: Makefile test_prefs.edc
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/test_prefs.edc \
        $(top_builddir)/data/objects/test_prefs.edj
 
@@ -86,7 +82,7 @@ test_prefs.epb: Makefile test_prefs.epc
        $(top_builddir)/data/objects/test_prefs.epb
 
 test_focus_custom.edj: Makefile test_focus_custom.edc
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/objects/test_focus_custom.edc \
        $(top_builddir)/data/objects/test_focus_custom.edj
 

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 8b65e7f..682e5f9 100644 (file)
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,19 +1,16 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
 
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/img -fd $(top_srcdir)/data/themes/fnt -sd $(top_srcdir)/data/themes/snd
+include ../../Makefile_Elm_Helpers.am
+
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/themes/img -fd $(top_srcdir)/data/themes/fnt -sd $(top_srcdir)/data/themes/snd
 
 filesdir = $(datadir)/elementary/themes
 files_DATA = default.edj
 
 default.edj: Makefile $(EXTRA_DIST)
-       $(EDJE_CC) \
-        -fastdecomp \
-        $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) \
+        $(EDJE_CC_FLAGS) \
        $(top_srcdir)/data/themes/default.edc \
        $(top_builddir)/data/themes/default.edj
 

diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index c0544f9..aaee066 100644 (file)
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 if EFL_BUILD_DOC
 
+include ../../Makefile_Elm_Helpers.am
+
 AM_CPPFLAGS = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/lib \
@@ -19,12 +21,10 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_EMAP_CFLAGS@
 
-ELM_PREFS_CC = @elm_prefs_cc@
-
 noinst_DATA = widget_preview_prefs.epb
 
 widget_preview_prefs.epb: Makefile widget_preview_prefs.epc
-       $(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \
+       $(AM_V_EPB)$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \
        $(top_srcdir)/doc/widgets/widget_preview_prefs.epc \
        $(top_builddir)/doc/widgets/widget_preview_prefs.epb
 

diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
index c774688..f6262dc 100644 (file)
--- a/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
@@ -53,6 +53,7 @@ AC_DEFUN([EFL_WITH_BIN],
 [
 
 m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
+m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))dnl
 
 dnl configure option
 
@@ -66,6 +67,7 @@ AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
 
 with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
 
+AM_CONDITIONAL(HAVE_[]UP, [test "x${_efl_binary_define}" = "xyes"])
 AC_SUBST(DOWN)
 
 ])

diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 7184ca1..fc35c75 100644 (file)
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,5 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+include ../../Makefile_Elm_Helpers.am
+
 .PHONY: screenshots
 
 examplesdir = $(pkgdatadir)/examples
@@ -27,14 +29,6 @@ LDADD = \
 @ELEMENTARY_X_LIBS@ \
 $(top_builddir)/src/lib/libelementary.la
 
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V))
-
-ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@
-
 ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@
 ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example
 
@@ -148,10 +142,10 @@ win_example.c \
 track_example_01.c
 
 .edc.edj:
-       $(EDJE_CC) $(EDJE_FLAGS) $< $@
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
 
 .epc.epb:
-       $(ELM_PREFS_CC) $< $@
+       $(AM_V_EPB)$(ELM_PREFS_CC) $< $@
 
 if EFL_INSTALL_EXAMPLES
 files_DATA += $(SRCS) \

diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 6f19bf5..72ded15 100644 (file)
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -1,10 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V))
+include ../../../Makefile_Elm_Helpers.am
 
 EXTRA_DIST = \
 elm_prefs_swallow.edc
@@ -13,7 +9,7 @@ filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
 files_DATA = elm_prefs_swallow.edj
 
 elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc
-       $(EDJE_CC) $(EDJE_FLAGS) \
+       $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
         $(top_srcdir)/src/modules/prefs/elm_prefs_swallow.edc \
        $(top_builddir)/src/modules/prefs/elm_prefs_swallow.edj