diff --git a/legacy/emotion/data/Makefile.am b/legacy/emotion/data/Makefile.am
index 92f1de413c..425c37a73e 100644
--- a/legacy/emotion/data/Makefile.am
+++ b/legacy/emotion/data/Makefile.am
@@ -5,7 +5,14 @@ EDJE_CC = @edje_cc@
 EDJE_FLAGS = -v -id $(top_srcdir)/data -fd $(top_srcdir)/data
 
 filesdir = $(datadir)/emotion/data
-files_DATA = theme.edj
+
+files_DATA =
+
+if BUILD_EMOTION_TEST
+
+files_DATA += theme.edj
+
+endif
 
 EXTRA_DIST = \
 bpause.png \
diff --git a/legacy/emotion/m4/efl_binary.m4 b/legacy/emotion/m4/efl_binary.m4
index 0fe85ab6ae..48c0b95a6e 100644
--- a/legacy/emotion/m4/efl_binary.m4
+++ b/legacy/emotion/m4/efl_binary.m4
@@ -3,7 +3,7 @@ dnl That code is public domain and can be freely used or copied.
 
 dnl Macro that check if a binary is built or not
 
-dnl Usage: EFL_ENABLE_BIN(binary)
+dnl Usage: EFL_ENABLE_BIN(binary[, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being tranformed into _)
 dnl Define have_binary (- is tranformed into _)
 dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being tranformed into _)
diff --git a/legacy/emotion/src/bin/Makefile.am b/legacy/emotion/src/bin/Makefile.am
index 157740821a..498c490623 100644
--- a/legacy/emotion/src/bin/Makefile.am
+++ b/legacy/emotion/src/bin/Makefile.am
@@ -12,8 +12,13 @@ AM_CPPFLAGS = \
 @ECORE_X_CFLAGS@ \
 @ECORE_FB_CFLAGS@
 
-bin_PROGRAMS = @EMOTION_TEST_PRG@
-EXTRA_PROGRAMS = emotion_test
+bin_PROGRAMS =
+
+if BUILD_EMOTION_TEST
+
+bin_PROGRAMS += emotion_test
+
+endif
 
 emotion_test_SOURCES = emotion_test_main.c