Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Makefile.am
Removed Files:
ecore_x.c ecore_x_atoms.c ecore_x_composite.c ecore_x_cursor.c
ecore_x_damage.c ecore_x_dnd.c ecore_x_dpms.c
ecore_x_drawable.c ecore_x_e.c ecore_x_error.c
ecore_x_events.c ecore_x_fixes.c ecore_x_gc.c ecore_x_icccm.c
ecore_x_mwm.c ecore_x_netwm.c ecore_x_pixmap.c
ecore_x_private.h ecore_x_randr.c ecore_x_screensaver.c
ecore_x_selection.c ecore_x_sync.c ecore_x_test.c
ecore_x_window.c ecore_x_window_prop.c ecore_x_window_shape.c
ecore_x_xinerama.c ecore_xcb.c ecore_xcb_atom.c
ecore_xcb_composite.c ecore_xcb_cursor.c ecore_xcb_damage.c
ecore_xcb_dnd.c ecore_xcb_dpms.c ecore_xcb_drawable.c
ecore_xcb_e.c ecore_xcb_events.c ecore_xcb_fixes.c
ecore_xcb_gc.c ecore_xcb_icccm.c ecore_xcb_mwm.c
ecore_xcb_netwm.c ecore_xcb_pixmap.c ecore_xcb_private.h
ecore_xcb_randr.c ecore_xcb_reply.c ecore_xcb_screensaver.c
ecore_xcb_selection.c ecore_xcb_shape.c ecore_xcb_sync.c
ecore_xcb_window.c ecore_xcb_window_prop.c
ecore_xcb_xinerama.c
Log Message:
Big change in configure.in, ecore_x and ecore_evas. Everything compile nicely
after a make maintainer-clean, with xlib or xcb. e17 also has no problem.
Please report any problem. Thanks
* put xlib and xcb specific code in their own directories inside ecore_x
* fix xcb logic check in autotools and ecore_evas
* update configure.in for detection of ecore_evas with xlib and xcb support,
update ecore_evas accordingly. Note that e17 needs a little fix after that,
it will come in a few minutes
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- Makefile.am 9 Jul 2008 15:18:55 -0000 1.42
+++ Makefile.am 23 Jul 2008 10:00:00 -0000 1.43
@@ -1,199 +1,36 @@
MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = xlib xcb
+
+if BUILD_ECORE_X
+
if BUILD_ECORE_X_XCB
-AM_CPPFLAGS = \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_txt \
--I$(top_builddir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore_txt
+DEP = xcb/libecore_x_xcb.la
else
+DEP = xlib/libecore_x_xlib.la
+endif
+
AM_CPPFLAGS = \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_txt \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_txt
-endif
-
-if BUILD_ECORE_X_XCB
lib_LTLIBRARIES = libecore_x.la
-include_HEADERS = \
-Ecore_X.h \
-Ecore_X_Atoms.h \
-Ecore_X_Cursor.h
-
-libecore_x_la_SOURCES = \
-ecore_xcb_atom.c \
-ecore_xcb_cursor.c \
-ecore_xcb_damage.c \
-ecore_xcb_composite.c \
-ecore_xcb_dnd.c \
-ecore_xcb_dpms.c \
-ecore_xcb_drawable.c \
-ecore_xcb_e.c \
-ecore_xcb_events.c \
-ecore_xcb_fixes.c \
-ecore_xcb_gc.c \
-ecore_xcb_icccm.c \
-ecore_xcb_mwm.c \
-ecore_xcb_netwm.c \
-ecore_xcb_pixmap.c \
-ecore_xcb_randr.c \
-ecore_xcb_reply.c \
-ecore_xcb_screensaver.c \
-ecore_xcb_selection.c \
-ecore_xcb_shape.c \
-ecore_xcb_sync.c \
-ecore_xcb_window.c \
-ecore_xcb_window_prop.c \
-ecore_xcb_xinerama.c \
-ecore_xcb.c \
-ecore_xcb_private.h \
-ecore_x_atoms_decl.h
-
-libecore_x_la_LIBADD = \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
-$(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
-libecore_x_la_LDFLAGS = -version-info @version_info@
+libecore_x_la_SOURCES =
-libecore_x_la_DEPENDENCIES = \
-$(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
+libecore_x_la_LIBADD = $(DEP)
-else
+libecore_x_la_LDFLAGS = -version-info @version_info@
-if BUILD_ECORE_X
+libecore_x_la_DEPENDENCIES = $(DEP)
-lib_LTLIBRARIES = libecore_x.la
include_HEADERS = \
Ecore_X.h \
Ecore_X_Atoms.h \
Ecore_X_Cursor.h
-libecore_x_la_SOURCES = \
-ecore_x.c \
-ecore_x_dnd.c \
-ecore_x_sync.c \
-ecore_x_randr.c \
-ecore_x_fixes.c \
-ecore_x_damage.c \
-ecore_x_composite.c \
-ecore_x_error.c \
-ecore_x_events.c \
-ecore_x_icccm.c \
-ecore_x_netwm.c \
-ecore_x_mwm.c \
-ecore_x_e.c \
-ecore_x_selection.c \
-ecore_x_window.c \
-ecore_x_window_prop.c \
-ecore_x_window_shape.c \
-ecore_x_pixmap.c \
-ecore_x_gc.c \
-ecore_x_xinerama.c \
-ecore_x_screensaver.c \
-ecore_x_dpms.c \
-ecore_x_drawable.c \
-ecore_x_cursor.c \
-ecore_x_test.c \
-ecore_x_atoms.c \
-ecore_x_private.h \
-ecore_x_atoms_decl.h
-
-libecore_x_la_LIBADD = \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
-$(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
-
-libecore_x_la_LDFLAGS = -version-info @version_info@
-
-libecore_x_la_DEPENDENCIES = \
-$(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
-
endif
-endif
-
-EXTRA_DIST = \
-Ecore_X.h \
-Ecore_X_Atoms.h \
-Ecore_X_Cursor.h \
-ecore_x.c \
-ecore_x_dnd.c \
-ecore_x_sync.c \
-ecore_x_randr.c \
-ecore_x_fixes.c \
-ecore_x_damage.c \
-ecore_x_composite.c \
-ecore_x_error.c \
-ecore_x_events.c \
-ecore_x_icccm.c \
-ecore_x_netwm.c \
-ecore_x_mwm.c \
-ecore_x_e.c \
-ecore_x_selection.c \
-ecore_x_window.c \
-ecore_x_window_prop.c \
-ecore_x_window_shape.c \
-ecore_x_pixmap.c \
-ecore_x_gc.c \
-ecore_x_xinerama.c \
-ecore_x_screensaver.c \
-ecore_x_dpms.c \
-ecore_x_drawable.c \
-ecore_x_cursor.c \
-ecore_x_test.c \
-ecore_x_atoms.c \
-ecore_x_private.h \
-ecore_x_atoms_decl.h
+EXTRA_DIST = ecore_x_atoms_decl.h
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
