kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dist rule: add files to EXTRA_DIST2 inconditionally 

Summary: ecore_con and ethumb were adding files to EXTRE_DIST confitionally

Reviewers: cedric, zmike, raster

Reviewed By: zmike

Subscribers: #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8558
This commit is contained in:
Vincent Torri 2019-04-04 10:39:05 -04:00 committed by Mike Blumenkrantz
parent fa97d86d0f
commit 985411f925
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makefile_Ecore_Con.am
View File

@ -1,7 +1,7 @@
### Library ### Library
ecore_con_eolian_files = \ ecore_con_eolian_files_common = \
lib/ecore_con/efl_net_socket.eo \ lib/ecore_con/efl_net_socket.eo \
lib/ecore_con/efl_net_socket_simple.eo \ lib/ecore_con/efl_net_socket_simple.eo \
lib/ecore_con/efl_net_socket_fd.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_session.eo \
lib/ecore_con/efl_net_ip_address.eo lib/ecore_con/efl_net_ip_address.eo
if HAVE_WINDOWS ecore_con_eolian_files_windows = \
ecore_con_eolian_files += \
lib/ecore_con/efl_net_socket_windows.eo \ lib/ecore_con/efl_net_socket_windows.eo \
lib/ecore_con/efl_net_dialer_windows.eo \ lib/ecore_con/efl_net_dialer_windows.eo \
lib/ecore_con/efl_net_server_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_socket_unix.eo \
lib/ecore_con/efl_net_dialer_unix.eo \ lib/ecore_con/efl_net_dialer_unix.eo \
lib/ecore_con/efl_net_server_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 endif
ecore_con_eolian_type_files = \ ecore_con_eolian_type_files = \
@ -64,8 +70,10 @@ ecoreconeolianfiles_DATA = \
endif endif
EXTRA_DIST2 += \ EXTRA_DIST2 += \
$(ecore_con_eolian_files) \ $(ecore_con_eolian_files_common) \
$(ecore_con_eolian_type_files) $(ecore_con_eolian_files_unix) \
$(ecore_con_eolian_files_windows) \
$(ecore_con_eolian_type_files)
lib_LTLIBRARIES += lib/ecore_con/libecore_con.la lib_LTLIBRARIES += lib/ecore_con/libecore_con.la

2
src/Makefile_Ethumb.am
View File

@ -64,11 +64,11 @@ modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules
ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj
CLEANFILES += modules/ethumb/emotion/template.edj CLEANFILES += modules/ethumb/emotion/template.edj
endif
EXTRA_DIST2 += \ EXTRA_DIST2 += \
modules/ethumb/emotion/template.edc \ modules/ethumb/emotion/template.edc \
modules/ethumb/emotion/placeholder.png modules/ethumb/emotion/placeholder.png
endif
### Binary ### Binary