aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2013-12-01 23:35:43 +0900
committerCedric Bail <cedric.bail@free.fr>2013-12-01 23:35:43 +0900
commitcf7b9d07e0a8cd0c0dcaac0910c01214ae050a43 (patch)
tree874618e0b347ce9e57c51691737aeded5688ab5c /data
parentgitignore: added autotools tool. (diff)
downloadelementary-cf7b9d07e0a8cd0c0dcaac0910c01214ae050a43.tar.gz
autotools: improve build system to be able to correctly pick outside and inside tools.
Diffstat (limited to 'data')
-rw-r--r--data/edje_externals/Makefile.am10
-rw-r--r--data/objects/Makefile.am30
-rw-r--r--data/themes/Makefile.am13
3 files changed, 22 insertions, 31 deletions
diff --git a/data/edje_externals/Makefile.am b/data/edje_externals/Makefile.am
index b5762b121..a4ae9066d 100644
--- 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 88c4f1a3b..f18e34743 100644
--- 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 8b65e7f7b..682e5f923 100644
--- 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