Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/cairo_x11
Modified Files:
Makefile.am evas_engine.c evas_x_main.c
Added Files:
Evas_Engine_Cairo_X11.h
Log Message:
move engine headers into engine dirs - and removes lots of useless old headers.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/cairo_x11/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 17 Jan 2006 03:47:38 -0000 1.4
+++ Makefile.am 25 Apr 2006 04:00:20 -0000 1.5
@@ -1,36 +1,31 @@
-## Process this file with automake to produce Makefile.in
-
AUTOMAKE_OPTIONS = 1.4 foreign
-# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I. \
- -I$(top_srcdir)/src/lib \
- -I$(top_srcdir)/src/lib/include \
- -I$(top_srcdir)/src/modules/engines \
- @FREETYPE_CFLAGS@ @x_cflags@ @CAIRO_CFLAGS@
+INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include
-I$(top_srcdir)/src/modules/engines/cairo_common @FREETYPE_CFLAGS@ @x_cflags@
@CAIRO_CFLAGS@
if BUILD_ENGINE_CAIRO_X11
-pkgdir =
$(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH)
+pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
+pkg_LTLIBRARIES = module.la
module_la_SOURCES = \
evas_engine.h \
evas_engine.c \
evas_x_main.c
-module_la_LIBADD = @CAIRO_LIBS@ @x_libs@
$(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la
$(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-L$(top_builddir)/src/lib/.libs
+module_la_LIBADD = @CAIRO_LIBS@ @x_libs@
$(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la
$(top_builddir)/src/lib/libevas.la
+module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib
-L$(top_builddir)/src/lib/.libs
+
+module_la_DEPENDENCIES = $(top_builddir)/config.h
-module_la_DEPENDENCIES = \
-$(top_builddir)/config.h
+include_HEADERS = Evas_Engine_Cairo_X11.h
endif
EXTRA_DIST = \
evas_engine.h \
evas_engine.c \
-evas_x_main.c
+evas_x_main.c \
+Evas_Engine_Cairo_X11.h
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/cairo_x11/evas_engine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_engine.c 28 Feb 2006 04:07:48 -0000 1.3
+++ evas_engine.c 25 Apr 2006 04:00:20 -0000 1.4
@@ -1,10 +1,10 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+#include <X11/Xlib.h>
#include "evas_common.h"
#include "evas_private.h"
#include "evas_engine.h"
-#include "evas_engine_api_cairo_x11.h"
#include "Evas_Engine_Cairo_X11.h"
#include "evas_cairo_common.h"
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/cairo_x11/evas_x_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_x_main.c 14 Jan 2006 12:13:37 -0000 1.1
+++ evas_x_main.c 25 Apr 2006 04:00:20 -0000 1.2
@@ -1,7 +1,7 @@
+#include <X11/Xlib.h>
#include "evas_common.h"
#include "evas_private.h"
#include "evas_engine.h"
-#include "evas_engine_api_cairo_x11.h"
#include "Evas_Engine_Cairo_X11.h"
#include "evas_cairo_common.h"
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
