diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 3b0298f519..508c694ec2 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,37 +1,26 @@
-BUILT_SOURCES += \
-                 lib/efl/interfaces/efl_control.eo.c \
-                 lib/efl/interfaces/efl_control.eo.h \
-                 lib/efl/interfaces/efl_file.eo.c \
-                 lib/efl/interfaces/efl_file.eo.h \
-                 lib/efl/interfaces/efl_image.eo.c \
-                 lib/efl/interfaces/efl_image.eo.h \
-                 lib/efl/interfaces/efl_player.eo.c \
-                 lib/efl/interfaces/efl_player.eo.h \
-                 lib/efl/interfaces/efl_text.eo.c \
-                 lib/efl/interfaces/efl_text.eo.h \
-                 lib/efl/interfaces/efl_text_properties.eo.c \
-                 lib/efl/interfaces/efl_text_properties.eo.h
+EOS = \
+	    lib/efl/interfaces/efl_control.eo \
+      lib/efl/interfaces/efl_file.eo \
+      lib/efl/interfaces/efl_image.eo \
+      lib/efl/interfaces/efl_player.eo \
+      lib/efl/interfaces/efl_text.eo \
+      lib/efl/interfaces/efl_text_properties.eo
 
-efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
-efleolianfiles_DATA = \
-              lib/efl/interfaces/efl_control.eo \
-              lib/efl/interfaces/efl_file.eo \
-              lib/efl/interfaces/efl_image.eo \
-              lib/efl/interfaces/efl_player.eo \
-              lib/efl/interfaces/efl_text.eo \
-              lib/efl/interfaces/efl_text_properties.eo
+EOS_H = $(EOS:%.eo=%.eo.h)
+EOS_C = $(EOS:%.eo=%.eo.c)
 
 EXTRA_DIST += \
               ${efleolianfiles_DATA} \
               lib/efl/Efl_Config.h \
               lib/efl/Efl.h
 
+efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
+efleolianfiles_DATA = $(EOS)
+
 lib_LTLIBRARIES += lib/efl/libefl.la
 
-lib_efl_libefl_la_SOURCES = \
-              lib/efl/interfaces/efl_interfaces_main.c
-
-lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EFL_CFLAGS@
+lib_efl_libefl_la_SOURCES = lib/efl/interfaces/efl_interfaces_main.c
+lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@
 lib_efl_libefl_la_LIBADD = @EFL_LIBS@
 lib_efl_libefl_la_DEPENDENCIES = @EFL_INTERNAL_LIBS@
 lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -42,10 +31,4 @@ dist_installed_eflheaders_DATA = \
               lib/efl/Efl.h
 
 installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
-nodist_installed_eflinterfaces_DATA = \
-              lib/efl/interfaces/efl_control.eo.h \
-              lib/efl/interfaces/efl_file.eo.h \
-              lib/efl/interfaces/efl_image.eo.h \
-              lib/efl/interfaces/efl_player.eo.h \
-              lib/efl/interfaces/efl_text.eo.h \
-              lib/efl/interfaces/efl_text_properties.eo.h
+nodist_installed_eflinterfaces_DATA = $(EOS_H)