diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index c38acacf6d..c51e38f2f4 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -1,7 +1,7 @@
 
 ### Library
 
-ecore_con_eolian_files = \
+ecore_con_eolian_files_common = \
         lib/ecore_con/efl_net_socket.eo \
         lib/ecore_con/efl_net_socket_simple.eo \
         lib/ecore_con/efl_net_socket_fd.eo \
@@ -30,16 +30,22 @@ ecore_con_eolian_files = \
         lib/ecore_con/efl_net_session.eo \
         lib/ecore_con/efl_net_ip_address.eo
 
-if HAVE_WINDOWS
-ecore_con_eolian_files += \
+ecore_con_eolian_files_windows = \
         lib/ecore_con/efl_net_socket_windows.eo \
         lib/ecore_con/efl_net_dialer_windows.eo \
         lib/ecore_con/efl_net_server_windows.eo
-else
-ecore_con_eolian_files += \
+
+ecore_con_eolian_files_unix = \
         lib/ecore_con/efl_net_socket_unix.eo \
         lib/ecore_con/efl_net_dialer_unix.eo \
         lib/ecore_con/efl_net_server_unix.eo
+
+ecore_con_eolian_files = $(ecore_con_eolian_files_common)
+
+if HAVE_WINDOWS
+ecore_con_eolian_files += $(ecore_con_eolian_files_windows)
+else
+ecore_con_eolian_files += $(ecore_con_eolian_files_unix)
 endif
 
 ecore_con_eolian_type_files = \
@@ -64,8 +70,10 @@ ecoreconeolianfiles_DATA = \
 endif
 
 EXTRA_DIST2 += \
-              $(ecore_con_eolian_files) \
-			   $(ecore_con_eolian_type_files)
+$(ecore_con_eolian_files_common) \
+$(ecore_con_eolian_files_unix) \
+$(ecore_con_eolian_files_windows) \
+$(ecore_con_eolian_type_files)
 
 
 lib_LTLIBRARIES += lib/ecore_con/libecore_con.la
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index 7e3897447f..f359ef434b 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -64,11 +64,11 @@ modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules
 
 ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj
 CLEANFILES += modules/ethumb/emotion/template.edj
+endif
 
 EXTRA_DIST2 += \
 modules/ethumb/emotion/template.edc \
 modules/ethumb/emotion/placeholder.png
-endif
 
 
 ### Binary