aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-11-07 21:46:56 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-11-07 21:46:56 +0000
commit7e3c136fce6befb94fe4299f8057a313804ec448 (patch)
tree8d4bb1d1b461c9dc206d2f6d6c0c9debe76119f9 /src
parente: don't yell about gnu make extension (rules with %) (diff)
downloadenlightenment-7e3c136fce6befb94fe4299f8057a313804ec448.tar.gz
e/modules: shorten edje flags
SVN revision: 78982
Diffstat (limited to 'src')
-rw-r--r--src/modules/Makefile.am2
-rw-r--r--src/modules/Makefile_illume-indicator.am4
-rw-r--r--src/modules/Makefile_illume-keyboard.am4
-rw-r--r--src/modules/Makefile_illume2.am4
-rw-r--r--src/modules/Makefile_tiling.am4
5 files changed, 5 insertions, 13 deletions
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 283daed0b..8f7346de9 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -24,7 +24,7 @@ EDJE_CC_1 = @edje_cc@
EDJE_FLAGS_VERBOSE_ = $(EDJE_FLAGS_VERBOSE_$(AM_DEFAULT_VERBOSITY))
EDJE_FLAGS_VERBOSE_0 =
EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V))
+EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) @EDJE_DEF@
if USE_MODULE_CONNMAN
include Makefile_connman.am
diff --git a/src/modules/Makefile_illume-indicator.am b/src/modules/Makefile_illume-indicator.am
index 83fa3d3f0..82e2a8d26 100644
--- a/src/modules/Makefile_illume-indicator.am
+++ b/src/modules/Makefile_illume-indicator.am
@@ -9,9 +9,7 @@ EXTRA_DIST += illume-indicator/e-module-illume-indicator.edc \
EXTRA_DIST += illume-indicator/images/base_bg.png \
illume-indicator/images/module_icon.png
-ILLUME_INDICATOR_EDJE_FLAGS = $(EDJE_FLAGS) \
- -id $(top_srcdir)/src/modules/illume-indicator/images \
- @EDJE_DEF@
+ILLUME_INDICATOR_EDJE_FLAGS = $(EDJE_FLAGS) -id illume-indicator/images
illume-indicator/%.edj: illume-indicator/%.edc Makefile
$(EDJE_CC) $(ILLUME_INDICATOR_EDJE_FLAGS) $< $@
diff --git a/src/modules/Makefile_illume-keyboard.am b/src/modules/Makefile_illume-keyboard.am
index 78c45d852..04f378347 100644
--- a/src/modules/Makefile_illume-keyboard.am
+++ b/src/modules/Makefile_illume-keyboard.am
@@ -36,9 +36,7 @@ illumedicts_DATA = illume-keyboard/dicts/English_US.dic \
EXTRA_DIST += $(illumedicts_DATA)
-ILLUME_KEYBOARD_EDJE_FLAGS = $(EDJE_FLAGS) \
- -id $(top_srcdir)/src/modules/illume-keyboard/images \
- @EDJE_DEF@
+ILLUME_KEYBOARD_EDJE_FLAGS = $(EDJE_FLAGS) -id illume-keyboard/images
illume-keyboard/%.edj: illume-keyboard/%.edc Makefile
$(EDJE_CC) $(ILLUME_KEYBOARD_EDJE_FLAGS) $< $@
diff --git a/src/modules/Makefile_illume2.am b/src/modules/Makefile_illume2.am
index e2e676a28..0cd4108c7 100644
--- a/src/modules/Makefile_illume2.am
+++ b/src/modules/Makefile_illume2.am
@@ -38,9 +38,7 @@ illume2_policies_tablet_tablet_la_SOURCES = illume2/policies/tablet/policy.c \
illume2/policies/tablet/tablet.h
illume2_policies_tablet_tablet_la_LIBTOOLFLAGS = --tag=disable-static
-ILLUME2_EDJE_FLAGS = $(EDJE_FLAGS) \
- -id $(top_srcdir)/src/modules/illume2/images \
- @EDJE_DEF@
+ILLUME2_EDJE_FLAGS = $(EDJE_FLAGS) -id illume2/images
illume2/%.edj: illume2/%.edc Makefile
$(EDJE_CC) $(ILLUME2_EDJE_FLAGS) $< $@
diff --git a/src/modules/Makefile_tiling.am b/src/modules/Makefile_tiling.am
index e86480d2f..66ae45038 100644
--- a/src/modules/Makefile_tiling.am
+++ b/src/modules/Makefile_tiling.am
@@ -10,9 +10,7 @@ EXTRA_DIST += $(tiling_DATA) \
tilingpkgdir = $(MDIR)/tiling/$(MODULE_ARCH)
tilingpkg_LTLIBRARIES = tiling/module.la
-TILING_EDJE_FLAGS = $(EDJE_FLAGS) \
- -id $(top_srcdir)/src/modules/tiling/images \
- @EDJE_DEF@
+TILING_EDJE_FLAGS = $(EDJE_FLAGS) -id tiling/images
tiling/%.edj: tiling/%.edc Makefile
$(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@