summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <daniel@octaforge.org>2018-08-01 13:31:15 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-01 13:31:15 -0400
commit9d9a3e87c8c29740dd0c143e2125ceb0eb6cdf5e (patch)
treef4cd7ad9f55dfe636f2285b60171965e0aa23592
parent3ede74a8fccba3c708398ced0da67366d5ebe293 (diff)
build: disable Lua binding generation
Summary: As Lua bindings don't work right now, it is pointless to waste build time generating them. Elua itself on the other hand is useful and should stay enabled. This also does some preparation work for separate configure switch for bindings after release, but for now keep configure switches as they are. Reviewers: zmike, stefan_schmidt Subscribers: cedric, bu5hm4n, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6721
-rw-r--r--configure.ac15
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/Makefile_Ecore_Audio.am2
-rw-r--r--src/Makefile_Ecore_Con.am2
-rw-r--r--src/Makefile_Edje.am2
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/Makefile_Elementary.am2
-rw-r--r--src/Makefile_Elua_Helper.am4
-rw-r--r--src/Makefile_Emotion.am2
-rw-r--r--src/Makefile_Evas.am2
10 files changed, 25 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index b73e753c87..1a2f89d016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5190,17 +5190,28 @@ AC_ARG_ENABLE([elua],
5190 fi 5190 fi
5191 ], 5191 ],
5192 [want_elua="yes"]) 5192 [want_elua="yes"])
5193
5194# turn this into an AC_ARG_ENABLE when bindings are reenabled
5195want_lua_bindings="no"
5196
5193have_elua="yes" 5197have_elua="yes"
5198have_lua_bindings="yes"
5199
5194if test "${want_lua_old}" = "yes" -o "x$want_elua" = "xno"; then 5200if test "${want_lua_old}" = "yes" -o "x$want_elua" = "xno"; then
5195 have_elua="no" 5201 have_elua="no"
5196fi 5202fi
5197 5203
5204if test "x$have_elua" = "xno" -o "x$want_lua_bindings" = "xno"; then
5205 have_lua_bindings="no"
5206fi
5207
5208AM_CONDITIONAL([HAVE_ELUA], [test "x${have_elua}" = "xyes"])
5209AM_CONDITIONAL([HAVE_LUA_BINDINGS], [test "x${have_lua_bindings}" = "xyes"])
5210
5198EFL_LIB_START_OPTIONAL([Elua], [test "${have_elua}" = "yes"]) 5211EFL_LIB_START_OPTIONAL([Elua], [test "${have_elua}" = "yes"])
5199 5212
5200### Default values 5213### Default values
5201 5214
5202AM_CONDITIONAL([HAVE_ELUA], [test "x${have_elua}" = "xyes"])
5203
5204### Additional options to configure 5215### Additional options to configure
5205 5216
5206### Checks for programs 5217### Checks for programs
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 30e49987e7..47b74678a3 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -390,7 +390,7 @@ EXTRA_DIST2 += \
390tests/ecore/sample.wav \ 390tests/ecore/sample.wav \
391tests/ecore/sample.ogg 391tests/ecore/sample.ogg
392 392
393if HAVE_ELUA 393if HAVE_LUA_BINDINGS
394 394
395ecore_eolian_lua = $(ecore_eolian_files:%.eo=%.eo.lua) 395ecore_eolian_lua = $(ecore_eolian_files:%.eo=%.eo.lua)
396 396
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 393fdfa799..919104fc93 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -75,7 +75,7 @@ lib/ecore_audio/ecore_audio_sndfile_vio.c
75endif 75endif
76 76
77 77
78if HAVE_ELUA 78if HAVE_LUA_BINDINGS
79 79
80ecore_audio_eolian_lua = $(ecore_audio_eolian_files:%.eo=%.eo.lua) 80ecore_audio_eolian_lua = $(ecore_audio_eolian_files:%.eo=%.eo.lua)
81 81
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 2568922992..ca1e80f617 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -236,7 +236,7 @@ tests_ecore_con_ecore_con_suite_DEPENDENCIES = \
236 236
237endif 237endif
238 238
239if HAVE_ELUA 239if HAVE_LUA_BINDINGS
240 240
241ecore_con_eolian_lua = $(ecore_con_eolian_files:%.eo=%.eo.lua) 241ecore_con_eolian_lua = $(ecore_con_eolian_files:%.eo=%.eo.lua)
242 242
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index fc83eaadc6..683583ae10 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -364,7 +364,7 @@ tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ $(EDJE_TEST_FILES)
364 364
365endif 365endif
366 366
367if HAVE_ELUA 367if HAVE_LUA_BINDINGS
368 368
369edje_eolian_lua = $(edje_eolian_files:%.eo=%.eo.lua) 369edje_eolian_lua = $(edje_eolian_files:%.eo=%.eo.lua)
370 370
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 972eda7e04..2dff54077a 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -147,7 +147,7 @@ nodist_installed_eflinterfaces_DATA = \
147 $(efl_eolian_files_h) \ 147 $(efl_eolian_files_h) \
148 $(efl_eolian_legacy_files_h) 148 $(efl_eolian_legacy_files_h)
149 149
150if HAVE_ELUA 150if HAVE_LUA_BINDINGS
151 151
152efl_eolian_lua = $(efl_eolian_files:%.eo=%.eo.lua) 152efl_eolian_lua = $(efl_eolian_files:%.eo=%.eo.lua)
153 153
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index b2a356b1f1..ac464f27a5 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1597,7 +1597,7 @@ tests_elementary_efl_ui_suite_LDADD = @CHECK_LIBS@ @USE_ELEMENTARY_LIBS@
1597tests_elementary_efl_ui_suite_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@ $(top_builddir)/data/elementary/objects/test.edj 1597tests_elementary_efl_ui_suite_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@ $(top_builddir)/data/elementary/objects/test.edj
1598endif 1598endif
1599 1599
1600if HAVE_ELUA 1600if HAVE_LUA_BINDINGS
1601 1601
1602elementary_eolian_lua = $(elm_public_eolian_files:%.eo=%.eo.lua) 1602elementary_eolian_lua = $(elm_public_eolian_files:%.eo=%.eo.lua)
1603 1603
diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am
index fa8782af4b..091b21e884 100644
--- a/src/Makefile_Elua_Helper.am
+++ b/src/Makefile_Elua_Helper.am
@@ -1,3 +1,5 @@
1if HAVE_LUA_BINDINGS
2
1if HAVE_ELUA_BIN 3if HAVE_ELUA_BIN
2ELUA_GEN = @elua_bin@ lualian 4ELUA_GEN = @elua_bin@ lualian
3_ELUA_GEN_DEP = @elua_bin@ 5_ELUA_GEN_DEP = @elua_bin@
@@ -22,3 +24,5 @@ SUFFIXES += .lua
22 24
23%.eo.lua: %.eo ${_ELUA_GEN_DEP} 25%.eo.lua: %.eo ${_ELUA_GEN_DEP}
24 $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $< 26 $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $<
27
28endif
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index c1dcd7beba..919edc0516 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -334,7 +334,7 @@ tests/emotion/data/whb.png \
334tests/emotion/data/window_inner_shadow.png \ 334tests/emotion/data/window_inner_shadow.png \
335modules/emotion/generic/README 335modules/emotion/generic/README
336 336
337if HAVE_ELUA 337if HAVE_LUA_BINDINGS
338 338
339emotion_eolian_lua = $(emotion_eolian_files:%.eo=%.eo.lua) 339emotion_eolian_lua = $(emotion_eolian_files:%.eo=%.eo.lua)
340 340
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index deab83005d..f882c1edfb 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2529,7 +2529,7 @@ tests/evas/images/train.j2k.png \
2529tests/evas/dicts/hyph_en_US.dic \ 2529tests/evas/dicts/hyph_en_US.dic \
2530tests/evas/dicts/hyph_de_DE.dic 2530tests/evas/dicts/hyph_de_DE.dic
2531 2531
2532if HAVE_ELUA 2532if HAVE_LUA_BINDINGS
2533 2533
2534evas_eolian_lua = $(evas_canvas_eolian_pub_files:%.eo=%.eo.lua) \ 2534evas_eolian_lua = $(evas_canvas_eolian_pub_files:%.eo=%.eo.lua) \
2535 $(evas_gesture_eolian_pub_files:%.eo=%.eo.lua) 2535 $(evas_gesture_eolian_pub_files:%.eo=%.eo.lua)