summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-17 10:38:50 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-18 16:01:07 +0200
commit2643ce0aadbf7b77cdb021404a7c93b0e0c43bca (patch)
treefdc60f911458fc2f71839f8b1ef88e6f81949d81
parent5aaf2cbb5defd64a2048fe90e80004d435bbca1a (diff)
downloadefl-2643ce0aadbf7b77cdb021404a7c93b0e0c43bca.tar.gz
build: move ELM_INTERNAL_API_ARGESFSDFEFC into buildsystem
the definition is now defined in the buildtools autools / meson. This reduces the amount of warnings in meson. Differential Revision: https://phab.enlightenment.org/D7170
-rw-r--r--src/Makefile_Elementary.am2
-rw-r--r--src/bin/elementary/elm_prefs_cc.h1
-rw-r--r--src/tests/elementary/elm_code_file_test_load.c2
-rw-r--r--src/tests/elementary/elm_code_file_test_memory.c2
-rw-r--r--src/tests/elementary/elm_code_test_basic.c2
-rw-r--r--src/tests/elementary/elm_code_test_indent.c2
-rw-r--r--src/tests/elementary/elm_code_test_line.c2
-rw-r--r--src/tests/elementary/elm_code_test_parse.c2
-rw-r--r--src/tests/elementary/elm_code_test_text.c2
-rw-r--r--src/tests/elementary/elm_code_test_widget.c2
-rw-r--r--src/tests/elementary/elm_code_test_widget_selection.c2
-rw-r--r--src/tests/elementary/elm_code_test_widget_text.c2
-rw-r--r--src/tests/elementary/elm_code_test_widget_undo.c2
-rw-r--r--src/tests/elementary/elm_test_atspi.c2
-rw-r--r--src/tests/elementary/elm_test_focus_common.h4
15 files changed, 5 insertions, 26 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 865c623841..45ad401950 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1136,6 +1136,7 @@ bin/elementary/elm_prefs_cc_handlers.c
bin_elementary_elm_prefs_cc_LDADD = @USE_ELEMENTARY_LIBS@
bin_elementary_elm_prefs_cc_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
bin_elementary_elm_prefs_cc_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib/elementary \
-I$(top_builddir)/src/lib/elementary \
@@ -1566,6 +1567,7 @@ tests_elementary_elm_suite_SOURCES = \
tests/elementary/elm_test_focus_sub.c
tests_elementary_elm_suite_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \
-DTESTS_SRC_DIR=\"${top_srcdir}/src/tests/elementary\" \
diff --git a/src/bin/elementary/elm_prefs_cc.h b/src/bin/elementary/elm_prefs_cc.h
index ef848babc8..645076eb2f 100644
--- a/src/bin/elementary/elm_prefs_cc.h
+++ b/src/bin/elementary/elm_prefs_cc.h
@@ -3,7 +3,6 @@
#include <Elementary.h>
-#define ELM_INTERNAL_API_ARGESFSDFEFC
#include "elm_priv.h"
#include "elm_widget_prefs.h"
diff --git a/src/tests/elementary/elm_code_file_test_load.c b/src/tests/elementary/elm_code_file_test_load.c
index 4a2aced04d..80bc941fdd 100644
--- a/src/tests/elementary/elm_code_file_test_load.c
+++ b/src/tests/elementary/elm_code_file_test_load.c
@@ -4,8 +4,6 @@
#include <libgen.h>
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
diff --git a/src/tests/elementary/elm_code_file_test_memory.c b/src/tests/elementary/elm_code_file_test_memory.c
index 4257e9c54b..142566d319 100644
--- a/src/tests/elementary/elm_code_file_test_memory.c
+++ b/src/tests/elementary/elm_code_file_test_memory.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
diff --git a/src/tests/elementary/elm_code_test_basic.c b/src/tests/elementary/elm_code_test_basic.c
index 5ae4915c85..8f2a035eb5 100644
--- a/src/tests/elementary/elm_code_test_basic.c
+++ b/src/tests/elementary/elm_code_test_basic.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include <stdlib.h>
#include "elm_suite.h"
diff --git a/src/tests/elementary/elm_code_test_indent.c b/src/tests/elementary/elm_code_test_indent.c
index b27f1a0834..a3a45612fe 100644
--- a/src/tests/elementary/elm_code_test_indent.c
+++ b/src/tests/elementary/elm_code_test_indent.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
#include "elm_code_indent.h"
diff --git a/src/tests/elementary/elm_code_test_line.c b/src/tests/elementary/elm_code_test_line.c
index 3f4dea7fb9..c1eec9db43 100644
--- a/src/tests/elementary/elm_code_test_line.c
+++ b/src/tests/elementary/elm_code_test_line.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
diff --git a/src/tests/elementary/elm_code_test_parse.c b/src/tests/elementary/elm_code_test_parse.c
index 91252283c2..af06449ade 100644
--- a/src/tests/elementary/elm_code_test_parse.c
+++ b/src/tests/elementary/elm_code_test_parse.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
#include "elm_code_parse.h"
diff --git a/src/tests/elementary/elm_code_test_text.c b/src/tests/elementary/elm_code_test_text.c
index 51716ce323..c6f6d22d88 100644
--- a/src/tests/elementary/elm_code_test_text.c
+++ b/src/tests/elementary/elm_code_test_text.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
#include "elm_code_text.h"
diff --git a/src/tests/elementary/elm_code_test_widget.c b/src/tests/elementary/elm_code_test_widget.c
index e510368fdb..7fbe2318c7 100644
--- a/src/tests/elementary/elm_code_test_widget.c
+++ b/src/tests/elementary/elm_code_test_widget.c
@@ -1,5 +1,3 @@
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
diff --git a/src/tests/elementary/elm_code_test_widget_selection.c b/src/tests/elementary/elm_code_test_widget_selection.c
index 8ad7611c6a..ed762f8111 100644
--- a/src/tests/elementary/elm_code_test_widget_selection.c
+++ b/src/tests/elementary/elm_code_test_widget_selection.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
#include "elm_code_widget_private.h"
diff --git a/src/tests/elementary/elm_code_test_widget_text.c b/src/tests/elementary/elm_code_test_widget_text.c
index e9eff3c1fd..c2794b9e4c 100644
--- a/src/tests/elementary/elm_code_test_widget_text.c
+++ b/src/tests/elementary/elm_code_test_widget_text.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
diff --git a/src/tests/elementary/elm_code_test_widget_undo.c b/src/tests/elementary/elm_code_test_widget_undo.c
index 9d3e59c9f1..d65a196ddd 100644
--- a/src/tests/elementary/elm_code_test_widget_undo.c
+++ b/src/tests/elementary/elm_code_test_widget_undo.c
@@ -2,8 +2,6 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
-
#include "elm_suite.h"
#include "Elementary.h"
#include "elm_code_widget_private.h"
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 1fdfa093ad..ff70c5bfe1 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -2,7 +2,7 @@
# include "elementary_config.h"
#endif
-#define ELM_INTERNAL_API_ARGESFSDFEFC
+
#define EFL_ACCESS_OBJECT_BETA
#define EFL_ACCESS_OBJECT_PROTECTED
diff --git a/src/tests/elementary/elm_test_focus_common.h b/src/tests/elementary/elm_test_focus_common.h
index bfce152cc3..3e93bbfeed 100644
--- a/src/tests/elementary/elm_test_focus_common.h
+++ b/src/tests/elementary/elm_test_focus_common.h
@@ -6,7 +6,7 @@
#endif
#define EFL_ACCESS_OBJECT_PROTECTED
-#define ELM_INTERNAL_API_ARGESFSDFEFC
+
#include <Elementary.h>
#include "elm_suite.h"
#include "elm_widget.h"
@@ -26,4 +26,4 @@ void elm_focus_test_setup_cross(Efl_Ui_Focus_Object **middle,
Efl_Ui_Focus_Object **west);
Efl_Ui_Focus_Manager *elm_focus_test_manager_new(Efl_Ui_Focus_Object **middle);
-#endif \ No newline at end of file
+#endif