aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Ecore_X.am
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-11-01 23:04:47 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-11-03 22:22:54 +0900
commit4ed2e01591e1575800d9aa871f76a5f7559060b3 (patch)
treee2ff598e015fecd3f26a9c717a2bae1334e1bb1d /src/Makefile_Ecore_X.am
parenteolian: rename is_ref API to is_ptr to match syntax (diff)
downloadefl-4ed2e01591e1575800d9aa871f76a5f7559060b3.tar.gz
remove xcb support in ecore_x and evas engines as per mailing list
as per mailing list discussion about dropping xcb support now. it hasn't been complete for a long time, thus not recommented for being turned on. as we are moving to a wayland world xcbmakes even less sense. as agreed, time to clean up a bit and remove a distraction as well as not well tested code. this also updates po's too. @feature
Diffstat (limited to 'src/Makefile_Ecore_X.am')
-rw-r--r--src/Makefile_Ecore_X.am142
1 files changed, 35 insertions, 107 deletions
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index 673cb704b4..7172114042 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -12,88 +12,41 @@ lib/ecore_x/Ecore_X_Atoms.h \
lib/ecore_x/Ecore_X_Cursor.h
lib_ecore_x_libecore_x_la_SOURCES = \
-lib/ecore_x/ecore_x_atoms_decl.h
-
-if HAVE_ECORE_X_XCB
-lib_ecore_x_libecore_x_la_SOURCES += \
-lib/ecore_x/xcb/ecore_xcb.c \
-lib/ecore_x/xcb/ecore_xcb_atoms.c \
-lib/ecore_x/xcb/ecore_xcb_extensions.c \
-lib/ecore_x/xcb/ecore_xcb_shape.c \
-lib/ecore_x/xcb/ecore_xcb_screensaver.c \
-lib/ecore_x/xcb/ecore_xcb_sync.c \
-lib/ecore_x/xcb/ecore_xcb_render.c \
-lib/ecore_x/xcb/ecore_xcb_randr.c \
-lib/ecore_x/xcb/ecore_xcb_xfixes.c \
-lib/ecore_x/xcb/ecore_xcb_composite.c \
-lib/ecore_x/xcb/ecore_xcb_cursor.c \
-lib/ecore_x/xcb/ecore_xcb_damage.c \
-lib/ecore_x/xcb/ecore_xcb_dnd.c \
-lib/ecore_x/xcb/ecore_xcb_dpms.c \
-lib/ecore_x/xcb/ecore_xcb_drawable.c \
-lib/ecore_x/xcb/ecore_xcb_e.c \
-lib/ecore_x/xcb/ecore_xcb_gc.c \
-lib/ecore_x/xcb/ecore_xcb_image.c \
-lib/ecore_x/xcb/ecore_xcb_input.c \
-lib/ecore_x/xcb/ecore_xcb_gesture.c \
-lib/ecore_x/xcb/ecore_xcb_mwm.c \
-lib/ecore_x/xcb/ecore_xcb_pixmap.c \
-lib/ecore_x/xcb/ecore_xcb_present.c \
-lib/ecore_x/xcb/ecore_xcb_region.c \
-lib/ecore_x/xcb/ecore_xcb_selection.c \
-lib/ecore_x/xcb/ecore_xcb_textlist.c \
-lib/ecore_x/xcb/ecore_xcb_events.c \
-lib/ecore_x/xcb/ecore_xcb_keymap.c \
-lib/ecore_x/xcb/ecore_xcb_keygrab.c \
-lib/ecore_x/xcb/ecore_xcb_netwm.c \
-lib/ecore_x/xcb/ecore_xcb_icccm.c \
-lib/ecore_x/xcb/ecore_xcb_window.c \
-lib/ecore_x/xcb/ecore_xcb_window_prop.c \
-lib/ecore_x/xcb/ecore_xcb_window_shape.c \
-lib/ecore_x/xcb/ecore_xcb_window_shadow.c \
-lib/ecore_x/xcb/ecore_xcb_xinerama.c \
-lib/ecore_x/xcb/ecore_xcb_error.c \
-lib/ecore_x/xcb/ecore_xcb_xtest.c \
-lib/ecore_x/xcb/ecore_xcb_vsync.c \
-lib/ecore_x/xcb/ecore_xcb_xdefaults.c \
-lib/ecore_x/xcb/ecore_xcb_private.h
-else
-lib_ecore_x_libecore_x_la_SOURCES += \
-lib/ecore_x/xlib/ecore_x.c \
-lib/ecore_x/xlib/ecore_x_dnd.c \
-lib/ecore_x/xlib/ecore_x_sync.c \
-lib/ecore_x/xlib/ecore_x_randr.c \
-lib/ecore_x/xlib/ecore_x_fixes.c \
-lib/ecore_x/xlib/ecore_x_damage.c \
-lib/ecore_x/xlib/ecore_x_composite.c \
-lib/ecore_x/xlib/ecore_x_error.c \
-lib/ecore_x/xlib/ecore_x_events.c \
-lib/ecore_x/xlib/ecore_x_icccm.c \
-lib/ecore_x/xlib/ecore_x_keygrab.c \
-lib/ecore_x/xlib/ecore_x_netwm.c \
-lib/ecore_x/xlib/ecore_x_mwm.c \
-lib/ecore_x/xlib/ecore_x_e.c \
-lib/ecore_x/xlib/ecore_x_selection.c \
-lib/ecore_x/xlib/ecore_x_window.c \
-lib/ecore_x/xlib/ecore_x_window_prop.c \
-lib/ecore_x/xlib/ecore_x_window_shape.c \
-lib/ecore_x/xlib/ecore_x_pixmap.c \
-lib/ecore_x/xlib/ecore_x_present.c \
-lib/ecore_x/xlib/ecore_x_gc.c \
-lib/ecore_x/xlib/ecore_x_xinerama.c \
-lib/ecore_x/xlib/ecore_x_screensaver.c \
-lib/ecore_x/xlib/ecore_x_dpms.c \
-lib/ecore_x/xlib/ecore_x_drawable.c \
-lib/ecore_x/xlib/ecore_x_cursor.c \
-lib/ecore_x/xlib/ecore_x_test.c \
-lib/ecore_x/xlib/ecore_x_atoms.c \
-lib/ecore_x/xlib/ecore_x_region.c \
-lib/ecore_x/xlib/ecore_x_image.c \
-lib/ecore_x/xlib/ecore_x_xi2.c \
-lib/ecore_x/xlib/ecore_x_vsync.c \
-lib/ecore_x/xlib/ecore_x_gesture.c \
-lib/ecore_x/xlib/ecore_x_private.h
-endif
+lib/ecore_x/ecore_x_atoms_decl.h \
+lib/ecore_x/ecore_x.c \
+lib/ecore_x/ecore_x_dnd.c \
+lib/ecore_x/ecore_x_sync.c \
+lib/ecore_x/ecore_x_randr.c \
+lib/ecore_x/ecore_x_fixes.c \
+lib/ecore_x/ecore_x_damage.c \
+lib/ecore_x/ecore_x_composite.c \
+lib/ecore_x/ecore_x_error.c \
+lib/ecore_x/ecore_x_events.c \
+lib/ecore_x/ecore_x_icccm.c \
+lib/ecore_x/ecore_x_keygrab.c \
+lib/ecore_x/ecore_x_netwm.c \
+lib/ecore_x/ecore_x_mwm.c \
+lib/ecore_x/ecore_x_e.c \
+lib/ecore_x/ecore_x_selection.c \
+lib/ecore_x/ecore_x_window.c \
+lib/ecore_x/ecore_x_window_prop.c \
+lib/ecore_x/ecore_x_window_shape.c \
+lib/ecore_x/ecore_x_pixmap.c \
+lib/ecore_x/ecore_x_present.c \
+lib/ecore_x/ecore_x_gc.c \
+lib/ecore_x/ecore_x_xinerama.c \
+lib/ecore_x/ecore_x_screensaver.c \
+lib/ecore_x/ecore_x_dpms.c \
+lib/ecore_x/ecore_x_drawable.c \
+lib/ecore_x/ecore_x_cursor.c \
+lib/ecore_x/ecore_x_test.c \
+lib/ecore_x/ecore_x_atoms.c \
+lib/ecore_x/ecore_x_region.c \
+lib/ecore_x/ecore_x_image.c \
+lib/ecore_x/ecore_x_xi2.c \
+lib/ecore_x/ecore_x_vsync.c \
+lib/ecore_x/ecore_x_gesture.c \
+lib/ecore_x/ecore_x_private.h
lib_ecore_x_libecore_x_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
@@ -101,34 +54,9 @@ lib_ecore_x_libecore_x_la_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_x\"
-if HAVE_ECORE_X_XCB
-lib_ecore_x_libecore_x_la_CPPFLAGS += -I$(top_builddir)/src/lib/ecore_x/xcb
-endif
lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@ @USE_ECORE_CON_LIBS@
lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@ @USE_ECORE_CON_INTERNAL_LIBS@
lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-if HAVE_ECORE_X_XCB
-MAINTAINERCLEANFILES += \
-$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h \
-$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h
-
-BUILT_SOURCES += \
-$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
-
-$(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h: $(KEYSYMDEFS) utils/ecore/makekeys$(EXEEXT)
- $(MKDIR_P) $(top_builddir)/src/lib/ecore_x/xcb
- $(top_builddir)/src/utils/ecore/makekeys $(KEYSYMDEFS) > $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h
- mv -f $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table_h $(top_builddir)/src/lib/ecore_x/xcb/ecore_xcb_keysym_table.h
-endif
-
-### Utils
-
-noinst_PROGRAMS += utils/ecore/makekeys
-
-utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
-utils_ecore_makekeys_CFLAGS = @ECORE_X_CFLAGS@
-
endif
-EXTRA_DIST2 += utils/ecore/mkks.sh