aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Eo.am
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-29 14:47:22 +0100
committerTom Hacohen <tom@stosb.com>2016-03-29 16:01:52 +0100
commit4a75116cb44ef10a93925d2505bcce337d663b6e (patch)
tree86288a671d078dba124ea1e00397f39659b41cc0 /src/Makefile_Eo.am
parentelm_fileselector: fix progressbar mode (diff)
downloadefl-4a75116cb44ef10a93925d2505bcce337d663b6e.tar.gz
Eo: Implement the fallback eo_add implementation.
The current eo_add uses a (very useful) gcc extension that is only available in gcc compatible compilers (e.g clang). Until this commit we just temporarily ignored this fact. This adds a fallback implementation that can be used interchangeably with the non portable one. This means that the same binary can call either at any point in time and the code will work. Breaks ABI.
Diffstat (limited to 'src/Makefile_Eo.am')
-rw-r--r--src/Makefile_Eo.am15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index e388318e8d..c8fbd52ee3 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -31,6 +31,8 @@ lib/eo/eo_ptr_indirection.c \
lib/eo/eo_ptr_indirection.h \
lib/eo/eo_base_class.c \
lib/eo/eo_class_class.c \
+lib/eo/eo_add_fallback.c \
+lib/eo/eo_add_fallback.h \
lib/eo/eo_private.h
lib_eo_libeo_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
@@ -58,6 +60,7 @@ tests/eo/test_interface \
tests/eo/test_mixin \
tests/eo/test_signals \
tests/eo/test_children \
+tests/eo/eo_suite_add_fallback \
tests/eo/eo_suite
tests_eo_test_children_SOURCES = \
@@ -129,15 +132,25 @@ tests/eo/suite/eo_test_general.c \
tests/eo/suite/eo_test_value.c \
tests/eo/suite/eo_test_threaded_calls.c \
tests/eo/suite/eo_test_init.c
+
tests_eo_eo_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo\" \
@CHECK_CFLAGS@ \
@EO_CFLAGS@
-TESTS += tests/eo/eo_suite
tests_eo_eo_suite_LDADD = @CHECK_LIBS@ @USE_EO_LIBS@
tests_eo_eo_suite_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
+TESTS += tests/eo/eo_suite
+
+tests_eo_eo_suite_add_fallback_SOURCES = $(tests_eo_eo_suite_SOURCES)
+tests_eo_eo_suite_add_fallback_CPPFLAGS = $(tests_eo_eo_suite_CPPFLAGS) \
+ -D_EO_ADD_FALLBACK_FORCE=1
+tests_eo_eo_suite_add_fallback_LDADD = $(tests_eo_eo_suite_LDADD)
+tests_eo_eo_suite_add_fallback_DEPENDENCIES = $(tests_eo_eo_suite_DEPENDENCIES)
+
+TESTS += tests/eo/eo_suite_add_fallback
+
tests_eo_test_function_overrides_SOURCES = \
tests/eo/function_overrides/function_overrides_inherit.c \
tests/eo/function_overrides/function_overrides_inherit.h \