diff --git a/src/modules/Makefile_illume-indicator.am b/src/modules/Makefile_illume-indicator.am
index b4aeb78e5..83fa3d3f0 100644
--- a/src/modules/Makefile_illume-indicator.am
+++ b/src/modules/Makefile_illume-indicator.am
@@ -13,10 +13,8 @@ ILLUME_INDICATOR_EDJE_FLAGS = $(EDJE_FLAGS) \
 	     -id $(top_srcdir)/src/modules/illume-indicator/images \
 	     @EDJE_DEF@
 
-illume-indicator/e-module-illume-indicator.edj: Makefile $(top_srcdir)/src/modules/illume-indicator/e-module-illume-indicator.edc 
-	$(EDJE_CC) $(ILLUME_INDICATOR_EDJE_FLAGS) \
-	$(top_srcdir)/src/modules/illume-indicator/e-module-illume-indicator.edc \
-	$(top_builddir)/src/modules/illume-indicator/e-module-illume-indicator.edj
+illume-indicator/%.edj: illume-indicator/%.edc Makefile
+	$(EDJE_CC) $(ILLUME_INDICATOR_EDJE_FLAGS) $< $@
 
 illume_indicatorpkgdir = $(MDIR)/illume-indicator/$(MODULE_ARCH)
 illume_indicatorpkg_LTLIBRARIES = illume-indicator/module.la
diff --git a/src/modules/Makefile_illume-keyboard.am b/src/modules/Makefile_illume-keyboard.am
index 72a65d7dc..78c45d852 100644
--- a/src/modules/Makefile_illume-keyboard.am
+++ b/src/modules/Makefile_illume-keyboard.am
@@ -40,10 +40,8 @@ ILLUME_KEYBOARD_EDJE_FLAGS = $(EDJE_FLAGS) \
 	     -id $(top_srcdir)/src/modules/illume-keyboard/images \
 	     @EDJE_DEF@
 
-illume-keyboard/e-module-illume-keyboard.edj: Makefile $(top_srcdir)/src/modules/illume-keyboard/e-module-illume-keyboard.edc 
-	$(EDJE_CC) $(ILLUME_KEYBOARD_EDJE_FLAGS) \
-	$(top_srcdir)/src/modules/illume-keyboard/e-module-illume-keyboard.edc \
-	$(top_builddir)/src/modules/illume-keyboard/e-module-illume-keyboard.edj
+illume-keyboard/%.edj: illume-keyboard/%.edc Makefile
+	$(EDJE_CC) $(ILLUME_KEYBOARD_EDJE_FLAGS) $< $@
 
 illume_keyboardpkgdir = $(MDIR)/illume-keyboard/$(MODULE_ARCH)
 illume_keyboardpkg_LTLIBRARIES = illume-keyboard/module.la
diff --git a/src/modules/Makefile_illume-softkey.am b/src/modules/Makefile_illume-softkey.am
index 970b9edb3..b76cf2b83 100644
--- a/src/modules/Makefile_illume-softkey.am
+++ b/src/modules/Makefile_illume-softkey.am
@@ -10,8 +10,7 @@ EXTRA_DIST += illume-softkey/images/shelf_alt_bg.png \
 	      illume-softkey/images/module_icon.png \
 	      illume-softkey/images/shelf_alt_over.png
 
-ILLUME_SOFTKEY_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/illume-softkey/images \
-			    @EDJE_DEF@
+ILLUME_SOFTKEY_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/illume-softkey/images
 
 illume-softkey/%.edj: illume-softkey/%.edc Makefile
 	$(EDJE_CC) $(ILLUME_SOFTKEY_EDJE_FLAGS) $< $@
diff --git a/src/modules/Makefile_illume2.am b/src/modules/Makefile_illume2.am
index 2f87724f9..e2e676a28 100644
--- a/src/modules/Makefile_illume2.am
+++ b/src/modules/Makefile_illume2.am
@@ -42,10 +42,8 @@ ILLUME2_EDJE_FLAGS = $(EDJE_FLAGS) \
 	     -id $(top_srcdir)/src/modules/illume2/images \
 	     @EDJE_DEF@
 
-illume2/e-module-illume2.edj: Makefile $(top_srcdir)/src/modules/illume2/e-module-illume2.edc
-	$(EDJE_CC) $(ILLUME2_EDJE_FLAGS) \
-	$(top_srcdir)/src/modules/illume2/e-module-illume2.edc \
-	$(top_builddir)/src/modules/illume2/e-module-illume2.edj
+illume2/%.edj: illume2/%.edc Makefile
+	$(EDJE_CC) $(ILLUME2_EDJE_FLAGS) $< $@
 
 illume2pkgdir = $(MDIR)/illume2/$(MODULE_ARCH)
 illume2pkg_LTLIBRARIES = illume2/module.la
diff --git a/src/modules/Makefile_tiling.am b/src/modules/Makefile_tiling.am
index 81058359b..e86480d2f 100644
--- a/src/modules/Makefile_tiling.am
+++ b/src/modules/Makefile_tiling.am
@@ -14,10 +14,8 @@ TILING_EDJE_FLAGS = $(EDJE_FLAGS) \
 		    -id $(top_srcdir)/src/modules/tiling/images \
 		    @EDJE_DEF@
 
-tiling/e-module-tiling.edj:  tiling/e-module-tiling.edc
-	$(EDJE_CC) $(TILING_EDJE_FLAGS) 	\
-	$(top_srcdir)/src/modules/tiling/e-module-tiling.edc \
-	$(top_builddir)/src/modules/tiling/e-module-tiling.edj
+tiling/%.edj: tiling/%.edc Makefile
+	$(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@
 
 tiling_module_la_SOURCES = tiling/e_mod_tiling.c \
 			   tiling/e_mod_tiling.h \