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

diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index b79c8f6..96fc778 100644 (file)
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -93,7 +93,7 @@
 #endif
 
 #ifdef _WIN32
-# ifdef ELEMENTARY_BUILD
+# ifdef EFL_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
@@ -397,7 +397,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 9bff045..6074510 100644 (file)
--- 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 ed55c23..1e085f8 100644 (file)
--- a/src/lib/elementary/elm_module_helper.h
+++ b/src/lib/elementary/elm_module_helper.h
@@ -15,7 +15,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 149916c..030771f 100644 (file)
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -38,7 +38,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 203f584..41a518f 100644 (file)
--- 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
 #include "elm_module_helper.h"
 
 /* to enable this module

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 caa10c8..b5ea889 100644 (file)
--- 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
 #include "elm_module_helper.h"
 
 #define CLOCK_FIELD_COUNT       8

diff --git a/src/modules/elementary/prefs/prefs_iface.c b/src/modules/elementary/prefs/prefs_iface.c
index 0c46a25..14ed9f3 100644 (file)
--- 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
 #include "private.h"
 
 /* including declaration of each prefs item implementation iface struct */

diff --git a/src/modules/elementary/test_entry/mod.c b/src/modules/elementary/test_entry/mod.c
index 8fd4181..f8abbef 100644 (file)
--- 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
 #include "elm_module_helper.h"
 
 // module api funcs needed

diff --git a/src/modules/elementary/test_map/mod.c b/src/modules/elementary/test_map/mod.c
index 457f247..85e6e52 100644 (file)
--- 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
 #include "elm_module_helper.h"
 
 EAPI Eina_Stringshare *

diff --git a/src/modules/elementary/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c
index e316e62..3310254 100644 (file)
--- 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
 #include "elm_module_helper.h"
 #include "elm_web_none_eo.h"