diff options
| author | Marcel Hollerbach <marcel-hollerbach@t-online.de> | 2017-02-03 19:22:37 +0100 |
|---|---|---|
| committer | Marcel Hollerbach <marcel-hollerbach@t-online.de> | 2017-02-07 09:24:52 +0100 |
| commit | e34f36be12d4f32ea5d70ff8a763b37bed818083 (patch) | |
| tree | b27d8fcb3f0928b36679b0afbfcb52b4be7a951f | |
| parent | 5ef4f45a647f0047410bd363d3f6d33ec8a84702 (diff) | |
| download | efl-e34f36be12d4f32ea5d70ff8a763b37bed818083.tar.gz | |
ecore_x: we dont need this version file anymore
it indicated a while back which backend was used, we only have xlib
left.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile_Ecore_X.am | 1 | ||||
| -rw-r--r-- | src/lib/ecore_x/Ecore_X.h | 3 | ||||
| -rw-r--r-- | src/lib/ecore_x/ecore_x_version.h.in | 8 |
4 files changed, 2 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 68d608d203..68cd0c25b3 100644 --- a/configure.ac +++ b/configure.ac @@ -4232,17 +4232,12 @@ if test "x${want_x11_xlib}" = "xyes" ; then fi EFL_ADD_FEATURE([ECORE_X], [xinput22]) - AC_DEFINE([HAVE_ECORE_X_XLIB], [1], [Defined to 1 if Xlib is enabled.]) - HAVE_ECORE_X_BACKEND="HAVE_ECORE_X_XLIB" - EFL_EVAL_PKGS([ECORE_X]) EFL_CHECK_FUNCS([ECORE_X], [dlopen dlsym]) fi EFL_ADD_LIBS([ECORE_X], [${ECORE_X_LIBS}]) -AC_SUBST([HAVE_ECORE_X_BACKEND]) - EFL_LIB_END_OPTIONAL([Ecore_X]) AM_CONDITIONAL([HAVE_ECORE_X_XLIB], [test "${want_x11_xlib}" = "yes"]) @@ -5614,7 +5609,6 @@ src/examples/eolian_cxx/Makefile src/examples/elocation/Makefile src/examples/elementary/Makefile src/lib/eina/eina_config.h -src/lib/ecore_x/ecore_x_version.h src/lib/efl/Efl_Config.h src/lib/elementary/Elementary_Options.h src/scripts/eo/eo_debug diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am index 7172114042..3b0252290b 100644 --- a/src/Makefile_Ecore_X.am +++ b/src/Makefile_Ecore_X.am @@ -7,7 +7,6 @@ lib_LTLIBRARIES += lib/ecore_x/libecore_x.la installed_ecorexmainheadersdir = $(includedir)/ecore-x-@VMAJ@ dist_installed_ecorexmainheaders_DATA = \ lib/ecore_x/Ecore_X.h \ -lib/ecore_x/ecore_x_version.h \ lib/ecore_x/Ecore_X_Atoms.h \ lib/ecore_x/Ecore_X_Cursor.h diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h index 21a94fab85..1d167c0f5a 100644 --- a/src/lib/ecore_x/Ecore_X.h +++ b/src/lib/ecore_x/Ecore_X.h @@ -42,7 +42,8 @@ typedef struct _Ecore_X_Version EAPI extern Ecore_X_Version *ecore_x_version; -#include "ecore_x_version.h" +//legacy this was earlier there to indicate if we are running under xlib or xcb +#define HAVE_ECORE_X_XLIB 1 #include <sys/types.h> diff --git a/src/lib/ecore_x/ecore_x_version.h.in b/src/lib/ecore_x/ecore_x_version.h.in deleted file mode 100644 index 98f1d6a9db..0000000000 --- a/src/lib/ecore_x/ecore_x_version.h.in +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _ECORE_X_VERSION_H_ -#define _ECORE_X_VERSION_H_ 1 - -#ifndef @HAVE_ECORE_X_BACKEND@ -#define @HAVE_ECORE_X_BACKEND@ 1 -#endif - -#endif |