summaryrefslogtreecommitdiff
path: root/src
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 /src
parent5aaf2cbb5defd64a2048fe90e80004d435bbca1a (diff)
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
Diffstat (limited to 'src')
-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
1136bin_elementary_elm_prefs_cc_LDADD = @USE_ELEMENTARY_LIBS@ 1136bin_elementary_elm_prefs_cc_LDADD = @USE_ELEMENTARY_LIBS@
1137bin_elementary_elm_prefs_cc_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@ 1137bin_elementary_elm_prefs_cc_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
1138bin_elementary_elm_prefs_cc_CPPFLAGS = \ 1138bin_elementary_elm_prefs_cc_CPPFLAGS = \
1139-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
1139-I$(top_srcdir) \ 1140-I$(top_srcdir) \
1140-I$(top_srcdir)/src/lib/elementary \ 1141-I$(top_srcdir)/src/lib/elementary \
1141-I$(top_builddir)/src/lib/elementary \ 1142-I$(top_builddir)/src/lib/elementary \
@@ -1566,6 +1567,7 @@ tests_elementary_elm_suite_SOURCES = \
1566 tests/elementary/elm_test_focus_sub.c 1567 tests/elementary/elm_test_focus_sub.c
1567 1568
1568tests_elementary_elm_suite_CPPFLAGS = \ 1569tests_elementary_elm_suite_CPPFLAGS = \
1570-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
1569-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ 1571-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
1570 -DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \ 1572 -DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \
1571 -DTESTS_SRC_DIR=\"${top_srcdir}/src/tests/elementary\" \ 1573 -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 @@
3 3
4#include <Elementary.h> 4#include <Elementary.h>
5 5
6#define ELM_INTERNAL_API_ARGESFSDFEFC
7#include "elm_priv.h" 6#include "elm_priv.h"
8#include "elm_widget_prefs.h" 7#include "elm_widget_prefs.h"
9 8
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 @@
4 4
5#include <libgen.h> 5#include <libgen.h>
6 6
7#define ELM_INTERNAL_API_ARGESFSDFEFC
8
9#include "elm_suite.h" 7#include "elm_suite.h"
10#include "Elementary.h" 8#include "Elementary.h"
11 9
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 5#include "elm_suite.h"
8#include "Elementary.h" 6#include "Elementary.h"
9 7
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include <stdlib.h> 5#include <stdlib.h>
8 6
9#include "elm_suite.h" 7#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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 5#include "elm_suite.h"
8#include "Elementary.h" 6#include "Elementary.h"
9#include "elm_code_indent.h" 7#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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 5#include "elm_suite.h"
8#include "Elementary.h" 6#include "Elementary.h"
9 7
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 5#include "elm_suite.h"
8#include "Elementary.h" 6#include "Elementary.h"
9#include "elm_code_parse.h" 7#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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 5#include "elm_suite.h"
8#include "Elementary.h" 6#include "Elementary.h"
9#include "elm_code_text.h" 7#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 @@
1#define ELM_INTERNAL_API_ARGESFSDFEFC
2
3#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
4# include "elementary_config.h" 2# include "elementary_config.h"
5#endif 3#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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 5#include "elm_suite.h"
8#include "Elementary.h" 6#include "Elementary.h"
9#include "elm_code_widget_private.h" 7#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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 5#include "elm_suite.h"
8#include "Elementary.h" 6#include "Elementary.h"
9 7
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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h" 5#include "elm_suite.h"
8#include "Elementary.h" 6#include "Elementary.h"
9#include "elm_code_widget_private.h" 7#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 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC 5
6#define EFL_ACCESS_OBJECT_BETA 6#define EFL_ACCESS_OBJECT_BETA
7#define EFL_ACCESS_OBJECT_PROTECTED 7#define EFL_ACCESS_OBJECT_PROTECTED
8 8
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 @@
6#endif 6#endif
7 7
8#define EFL_ACCESS_OBJECT_PROTECTED 8#define EFL_ACCESS_OBJECT_PROTECTED
9#define ELM_INTERNAL_API_ARGESFSDFEFC 9
10#include <Elementary.h> 10#include <Elementary.h>
11#include "elm_suite.h" 11#include "elm_suite.h"
12#include "elm_widget.h" 12#include "elm_widget.h"
@@ -26,4 +26,4 @@ void elm_focus_test_setup_cross(Efl_Ui_Focus_Object **middle,
26 Efl_Ui_Focus_Object **west); 26 Efl_Ui_Focus_Object **west);
27 27
28Efl_Ui_Focus_Manager *elm_focus_test_manager_new(Efl_Ui_Focus_Object **middle); 28Efl_Ui_Focus_Manager *elm_focus_test_manager_new(Efl_Ui_Focus_Object **middle);
29#endif \ No newline at end of file 29#endif