aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-04-11 17:51:13 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-04-11 17:58:56 +0100
commita12bd0ad305eccc983ed6cba658b80105620748d (patch)
tree3428e14f5f57fa6a3b592af81c12d446ab307d4a
parentefl_ui_list: fix to delete sub objects in efl_object_invalidate (diff)
downloadefl-a12bd0ad305eccc983ed6cba658b80105620748d.tar.gz
elementary: rename ELEMENTARY_BUILD to EFL_BUILD like all other libs
Test Plan: compilation Reviewers: cedric, raster, zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8598
-rw-r--r--src/lib/elementary/Elementary.h4
-rw-r--r--src/lib/elementary/elementary_config.h2
-rw-r--r--src/lib/elementary/elm_module_helper.h2
-rw-r--r--src/lib/elementary/elm_priv.h2
-rw-r--r--src/modules/elementary/access_output/mod.c4
-rw-r--r--src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c4
-rw-r--r--src/modules/elementary/prefs/prefs_iface.c4
-rw-r--r--src/modules/elementary/test_entry/mod.c4
-rw-r--r--src/modules/elementary/test_map/mod.c4
-rw-r--r--src/modules/elementary/web/none/elm_web_none.c4
10 files changed, 23 insertions, 11 deletions
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 119a3edfaa..67688ea155 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -87,7 +87,7 @@
#endif
#ifdef _WIN32
-# ifdef ELEMENTARY_BUILD
+# ifdef EFL_BUILD
# ifdef DLL_EXPORT
# define EAPI __declspec(dllexport)
# else
@@ -384,7 +384,7 @@ typedef Eo Efl_Ui_Pager;
}
#endif
-#ifndef ELEMENTARY_BUILD
+#ifndef EFL_BUILD
# undef EAPI
# define EAPI
#endif
diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h
index 9bff045c04..6074510b0d 100644
--- a/src/lib/elementary/elementary_config.h
+++ b/src/lib/elementary/elementary_config.h
@@ -9,7 +9,7 @@
#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme"
-#if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC)
+#if defined(EFL_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC)
#define EFL_UI_WIDGET_PROTECTED
#define EFL_CANVAS_OBJECT_PROTECTED
#define EFL_CANVAS_GROUP_PROTECTED
diff --git a/src/lib/elementary/elm_module_helper.h b/src/lib/elementary/elm_module_helper.h
index 8f882dabaa..eba3237266 100644
--- a/src/lib/elementary/elm_module_helper.h
+++ b/src/lib/elementary/elm_module_helper.h
@@ -13,7 +13,7 @@
#endif
#ifdef _WIN32
-# ifdef ELEMENTARY_BUILD
+# ifdef EFL_BUILD
# ifdef DLL_EXPORT
# define EAPI __declspec(dllexport)
# else
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 54c32cf9a6..fa262e2646 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -35,7 +35,7 @@
# endif
# ifdef _WIN32
-# ifdef ELEMENTARY_BUILD
+# ifdef EFL_BUILD
# ifdef DLL_EXPORT
# define EAPI __declspec(dllexport)
# else
diff --git a/src/modules/elementary/access_output/mod.c b/src/modules/elementary/access_output/mod.c
index f1c9dafd46..f51b512a47 100644
--- a/src/modules/elementary/access_output/mod.c
+++ b/src/modules/elementary/access_output/mod.c
@@ -4,7 +4,9 @@
#include "Elementary.h"
-#define ELEMENTARY_BUILD
+#ifndef EFL_BUILD
+# define EFL_BUILD
+#endif
#undef ELM_MODULE_HELPER_H
#include "elm_module_helper.h"
diff --git a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
index 5daabebe0a..077bd7d14e 100644
--- a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
+++ b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
@@ -9,7 +9,9 @@
#include "elm_ctxpopup_item_eo.h"
#include "elm_ctxpopup_eo.h"
-#define ELEMENTARY_BUILD
+#ifndef EFL_BUILD
+# define EFL_BUILD
+#endif
#undef ELM_MODULE_HELPER_H
#include "elm_module_helper.h"
diff --git a/src/modules/elementary/prefs/prefs_iface.c b/src/modules/elementary/prefs/prefs_iface.c
index 4943cd4566..d09658a052 100644
--- a/src/modules/elementary/prefs/prefs_iface.c
+++ b/src/modules/elementary/prefs/prefs_iface.c
@@ -4,7 +4,9 @@
#include "Elementary.h"
-#define ELEMENTARY_BUILD
+#ifndef EFL_BUILD
+# define EFL_BUILD
+#endif
#undef ELM_MODULE_HELPER_H
#include "private.h"
diff --git a/src/modules/elementary/test_entry/mod.c b/src/modules/elementary/test_entry/mod.c
index 0d16e22226..b80cb182ce 100644
--- a/src/modules/elementary/test_entry/mod.c
+++ b/src/modules/elementary/test_entry/mod.c
@@ -4,7 +4,9 @@
#include "Elementary.h"
-#define ELEMENTARY_BUILD
+#ifndef EFL_BUILD
+# define EFL_BUILD
+#endif
#undef ELM_MODULE_HELPER_H
#include "elm_module_helper.h"
diff --git a/src/modules/elementary/test_map/mod.c b/src/modules/elementary/test_map/mod.c
index 4d7db03284..15c4ff3344 100644
--- a/src/modules/elementary/test_map/mod.c
+++ b/src/modules/elementary/test_map/mod.c
@@ -6,7 +6,9 @@
#include "elm_module_helper.h"
#include "elm_widget_map.h"
-#define ELEMENTARY_BUILD
+#ifndef EFL_BUILD
+# define EFL_BUILD
+#endif
#undef ELM_MODULE_HELPER_H
#include "elm_module_helper.h"
diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index 6ac26507ed..d601460bda 100644
--- a/src/modules/elementary/web/none/elm_web_none.c
+++ b/src/modules/elementary/web/none/elm_web_none.c
@@ -9,7 +9,9 @@
#include "elm_priv.h"
#include "elm_widget_web.h"
-#define ELEMENTARY_BUILD
+#ifndef EFL_BUILD
+# define EFL_BUILD
+#endif
#undef ELM_MODULE_HELPER_H
#include "elm_module_helper.h"
#include "elm_web_none_eo.h"