diff --git a/src/Makefile.am b/src/Makefile.am
index 9e28ab4a61..a988467d84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -132,11 +132,8 @@ examples/ethumb_client \
 examples/eina_cxx \
 examples/eolian_cxx \
 examples/efl_mono \
-examples/elementary
-
-if HAVE_ELUA
-EXAMPLES_SUBDIRS += examples/elua
-endif
+examples/elementary \
+examples/elua
 
 if ALWAYS_BUILD_EXAMPLES
 SUBDIRS += . $(EXAMPLES_SUBDIRS)
diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am
index bd1da51f90..bc2513f903 100644
--- a/src/Makefile_Elua.am
+++ b/src/Makefile_Elua.am
@@ -54,41 +54,33 @@ ELUA_APPS_DIR = $(abs_top_srcdir)/src/scripts/elua/apps
 ### Helper for other modules using Elua
 include Makefile_Elua_Helper.am
 
-eluaappsdir = $(datadir)/elua/apps
-
-eluaapps_DATA = \
+endif
+eluaapps_files = \
 	scripts/elua/apps/lualian.lua \
 	scripts/elua/apps/gendoc.lua \
 	scripts/elua/apps/gendoc.sh \
 	scripts/elua/apps/README-docgen.md
 
-EXTRA_DIST2 += $(eluaapps_DATA)
+EXTRA_DIST2 += $(eluaapps_files)
 
-eluadocgendir = $(datadir)/elua/apps/docgen
-
-eluadocgen_DATA = \
+eluadocgen_files = \
 	scripts/elua/apps/docgen/doctree.lua \
 	scripts/elua/apps/docgen/keyref.lua \
 	scripts/elua/apps/docgen/stats.lua \
 	scripts/elua/apps/docgen/util.lua \
 	scripts/elua/apps/docgen/writer.lua
 
-EXTRA_DIST2 += $(eluadocgen_DATA)
-
-eluamodulesdir = $(datadir)/elua/modules
-
-eluamodules_DATA = \
+EXTRA_DIST2 += $(eluadocgen_files)
+eluamodules_files = \
 	scripts/elua/modules/benchmark.lua \
 	scripts/elua/modules/getopt.lua \
 	scripts/elua/modules/lualian.lua \
 	bindings/luajit/eo.lua \
 	bindings/luajit/eolian.lua
 
-EXTRA_DIST2 += $(eluamodules_DATA)
+EXTRA_DIST2 += $(eluamodules_files)
 
-eluaeinadir = $(eluamodulesdir)/eina
-
-eluaeina_DATA = \
+eluaeina_files = \
 	bindings/luajit/eina/accessor.lua \
 	bindings/luajit/eina/counter.lua \
 	bindings/luajit/eina/file.lua \
@@ -100,18 +92,27 @@ eluaeina_DATA = \
 	bindings/luajit/eina/tiler.lua \
 	bindings/luajit/eina/xattr.lua
 
-EXTRA_DIST2 += $(eluaeina_DATA)
+EXTRA_DIST2 += $(eluaeina_files)
 
-eluacoredir = $(datadir)/elua/core
-
-eluacore_DATA = \
+eluacore_files = \
 	scripts/elua/core/gettext.lua \
 	scripts/elua/core/module.lua \
 	scripts/elua/core/serializer.lua \
 	scripts/elua/core/util.lua
 
-EXTRA_DIST2 += $(eluacore_DATA)
+EXTRA_DIST2 += $(eluacore_files)
 
+if HAVE_ELUA
+eluaappsdir = $(datadir)/elua/apps
+eluaapps_DATA = $(eluaapps_files)
+eluamodulesdir = $(datadir)/elua/modules
+eluamodules_DATA = $(eluamodules_files)
+eluadocgendir = $(datadir)/elua/apps/docgen
+eluadocgen_DATA = $(eluadocgen_files)
+eluaeinadir = $(eluamodulesdir)/eina
+eluaeina_DATA = $(eluaeina_files)
+eluacoredir = $(datadir)/elua/core
+eluacore_DATA = $(eluacore_files)
 if EFL_ENABLE_TESTS
 
 check_PROGRAMS += tests/elua/elua_suite
@@ -145,6 +146,5 @@ tests_elua_elua_suite_DEPENDENCIES = @USE_ELUA_INTERNAL_LIBS@
 
 endif
 
-EXTRA_DIST2 += tests/elua/data/apps/test.lua
-
 endif
+EXTRA_DIST2 += tests/elua/data/apps/test.lua
diff --git a/src/examples/elua/Makefile.am b/src/examples/elua/Makefile.am
index 54b01fff92..031afc3bb3 100644
--- a/src/examples/elua/Makefile.am
+++ b/src/examples/elua/Makefile.am
@@ -5,10 +5,6 @@ MAINTAINERCLEANFILES = Makefile.in
 DATA_FILES =
 EXTRA_DIST = $(DATA_FILES)
 
-examples: ;
-
-clean-local: ;
-
 install-examples:
 	$(MKDIR_P) $(DESTDIR)$(datadir)/elua/examples
 #	cd $(srcdir) && $(install_sh_DATA) -c $(DATA_FILES) $(DESTDIR)$(datadir)/elua/examples
@@ -17,5 +13,11 @@ install-examples:
 #	for f in $(DATA_FILES); do \
 #	  rm -f $(DESTDIR)$(datadir)/elua/examples/$$f ; \
 #	done
-
+else
+install-examples:
 endif
+
+examples: ;
+
+clean-local: ;
+