ecore_x: we dont need this version file anymore

Desktop / Enlightenment / EFL Core Libraries - Marcel Hollerbach [t-online.de] - 7 February 2017 03:24 EST

it indicated a while back which backend was used, we only have xlib left.

###

diff --git a/configure.ac b/configure.ac
index 68d608d..68cd0c2 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 7172114..3b02522 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 21a94fa..1d167c0 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

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 98f1d6a..0000000
--- 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

e34f36b ecore_x: we dont need this version file anymore
configure.ac | 6 ------
src/Makefile_Ecore_X.am | 1 -
src/lib/ecore_x/Ecore_X.h | 3 ++-
src/lib/ecore_x/ecore_x_version.h.in | 8 --------
4 files changed, 2 insertions(+), 16 deletions(-)

Upstream: git.enlightenment.org


  • Share