bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0ba66d722295a5f418e59ed0255b1dd6d5558c31
commit 0ba66d722295a5f418e59ed0255b1dd6d5558c31
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Thu Mar 28 11:25:21 2019 -0400
build: improve autotools generation of elm config
- don't generate and re-link on every make rule
- fix distcheck
Reviewed-by: Marcel Hollerbach <m...@marcel-hollerbach.de>
Reviewed-by: YeongJong Lee <yj34....@samsung.com>
Differential Revision: https://phab.enlightenment.org/D8506
---
src/Makefile_Elementary.am | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 414a1250c5..f6a9dd3e1c 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -215,8 +215,7 @@ BUILT_SOURCES += \
$(elm_private_eolian_h) \
$(elm_legacy_eolian_c) \
$(elm_legacy_eolian_eo_h) \
- $(elm_legacy_eolian_legacy_h) \
- lib/elementary/elm_default_config.x
+ $(elm_legacy_eolian_legacy_h)
if INSTALL_EO_FILES
elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@
@@ -992,6 +991,8 @@ includesub_HEADERS = \
includesubdir = $(includedir)/elementary-@VMAJ@/
+lib/elementary/elm_config.c: lib/elementary/elm_default_config.x
+
lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_priv.h \
static_libs/atspi/atspi-constants.h \
@@ -1599,7 +1600,7 @@ EXTRA_DIST2 +=
modules/elementary/prefs/elm_prefs_swallow.edc
prefs_filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
prefs_files_DATA = modules/elementary/prefs/elm_prefs_swallow.edj
-CLEANFILES += $(prefs_files_DATA)
+CLEANFILES += $(prefs_files_DATA) lib/elementary/elm_default_config.x
modules/elementary/prefs/elm_prefs_swallow.edj:
modules/elementary/prefs/elm_prefs_swallow.edc bin/edje/edje_cc${EXEEXT}
$(AM_V_EDJ) \
@@ -2002,9 +2003,8 @@ EXTRA_DIST2 += \
tests/elementary/elm_suite.h \
lib/elementary/Elementary_Options.h.in \
lib/elementary/elm_code_widget_text.c \
-lib/elementary/elm_code_widget_undo.c
-
-PHONIES += lib/elementary/elm_default_config.x
+lib/elementary/elm_code_widget_undo.c \
+lib/elementary/config_embed
-lib/elementary/elm_default_config.x:
$(abs_top_srcdir)/data/elementary/config/standard/base.src.in
$(abs_top_srcdir)/src/lib/elementary/config_embed
- lib/elementary/config_embed $< $@
+lib/elementary/elm_default_config.x:
+ lib/elementary/config_embed
$(abs_top_srcdir)/data/elementary/config/standard/base.src.in $@
--
