From: caro Date: Mon, 24 Nov 2008 06:18:31 +0000 (+0000) Subject: * use the m4 macro EVAS_CHECK_ENGINE to check if an engine is available or not X-Git-Tag: submit/trunk/20120815.174732~3567 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e374e6c798a7891b80cfe8c4655367c7d7ac440;p=profile%2Fivi%2Fevas.git * use the m4 macro EVAS_CHECK_ENGINE to check if an engine is available or not * group the want_* variables related to engines and loaders at the beginning of configure.ac * use -no-undefined directly instead of a flag checked wrt the host * some clean up in Makefile.am files Please report any problem git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@37784 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/Makefile.am b/Makefile.am index 5e8259d..db5279d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,7 @@ if BUILD_ENGINE_SOFTWARE_16_WINCE psoftware16wince = evas-software-16-wince.pc endif -if BUILD_ENGINE_SDL +if BUILD_ENGINE_SOFTWARE_SDL psoftwaresdl = evas-software-sdl.pc endif diff --git a/configure.ac b/configure.ac index 1d2f0df..29b2ac0 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,61 @@ SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'` version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" AC_SUBST(version_info) + +want_evas_engine_buffer="yes" +want_evas_engine_software_x11="no" +want_evas_engine_xrender_x11="no" +want_evas_engine_gl_x11="no" +want_evas_engine_glitz_x11="no" +want_evas_engine_cairo_x11="no" +want_evas_engine_software_xcb="no" +want_evas_engine_xrender_xcb="no" +want_evas_engine_software_ddraw="no" +want_evas_engine_direct3d="no" +want_evas_engine_quartz="no" +want_evas_engine_gl_glew="no" +want_evas_engine_software_sdl="no" +want_evas_engine_fb="no" +want_evas_engine_directfb="no" +want_evas_engine_software_qtopia="no" +want_evas_engine_software_16_x11="no" +want_evas_engine_software_16_ddraw="no" +want_evas_engine_software_16_wince="no" + +want_evas_image_loader_edb="yes" +want_evas_image_loader_eet="yes" +want_evas_image_loader_gif="yes" +want_evas_image_loader_jpeg="yes" +want_evas_image_loader_pmaps="yes" +want_evas_image_loader_png="yes" +want_evas_image_loader_svg="yes" +want_evas_image_loader_tiff="yes" +want_evas_image_loader_xpm="yes" + +want_evas_font_loader_eet="yes" + +case "$host_os" in + mingw32ce* | cegcc*) + want_evas_engine_software_16_wince="yes" + want_evas_image_loader_edb="no" + want_evas_image_loader_gif="no" + want_evas_image_loader_svg="no" + want_evas_image_loader_tiff="no" + ;; + mingw*) + want_evas_engine_software_ddraw="yes" + want_evas_engine_direct3d="auto" + want_evas_engine_software_16_ddraw="yes" + want_evas_image_loader_edb="no" + want_evas_image_loader_svg="no" + ;; + *) + want_evas_engine_software_x11="auto" + want_evas_engine_xrender_x11="auto" + want_evas_engine_software_16_x11="auto" + ;; +esac + LT_PROG_RC AC_FUNC_ALLOCA @@ -40,7 +95,6 @@ PKG_PROG_PKG_CONFIG WIN32_CPPFLAGS="" WIN32_CFLAGS="" -lt_no_undefined="" lt_enable_auto_import="" case "$host_os" in mingw*|cegcc*) @@ -56,24 +110,12 @@ case "$host_os" in if test "$host_os" = "mingw32ce" ; then WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420" fi - lt_no_undefined="-no-undefined" ;; esac AC_SUBST(WIN32_CPPFLAGS) AC_SUBST(WIN32_CFLAGS) -AC_SUBST(lt_no_undefined) AC_SUBST(lt_enable_auto_import) -x_dir="" -x_cflags="" -x_libs="" -gl_dir="" -gl_cflags="" -gl_libs="" -qt_dir="" -qt_cflags="" -qt_libs="" -qt_moc="moc" dnl when used, that option makes configure script fails when dnl a requirement is selected, but not met. @@ -86,23 +128,10 @@ AC_ARG_ENABLE(strict, ##################################################################### # Check evas strong dependencie -PKG_CHECK_MODULES([EINA], [eina-0]) -##################################################################### - -# blah-config style checks -# qtdir setting -AC_ARG_WITH(qtdir, -AC_HELP_STRING([--with-qtdir=QT_DIR], [use qt directory specified]), -[ - qt_dir=$withval; - echo "using "$qt_dir" for qt directory."; -], [ - qt_dir="/opt/Qtopia"; -]) +PKG_CHECK_MODULES([EINA], [eina-0]) -# check for freetype -PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.3.0) +PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 9.3.0]) ####################################### ## Simple X11 build/link @@ -185,657 +214,115 @@ fi ##################################################################### ## Engines -####################################### -## Check if we should build the software_ddraw engine -want_evas_software_ddraw="auto"; -have_evas_software_ddraw="no"; - -AC_MSG_CHECKING(whether software directdraw backend is to be built) -AC_ARG_ENABLE(software-ddraw, - AC_HELP_STRING([--enable-software-ddraw], [enable the Software DirectDraw rendering backend]), - [ want_evas_software_ddraw=$enableval ] -) -AC_MSG_RESULT($want_evas_software_ddraw) +EVAS_CHECK_ENGINE([buffer], [${want_evas_engine_buffer}], [no], [Buffer]) -if test "x$want_evas_software_ddraw" = "xyes" -o "x$want_evas_software_ddraw" = "xauto" ; then - AC_CHECK_HEADER(ddraw.h, - [ - have_evas_software_ddraw="yes" - AC_DEFINE(BUILD_ENGINE_SOFTWARE_DDRAW, 1, [Software DirectDraw Rendering Backend]) - ddraw_libs="-lddraw" - ], - [ - if test "x$want_evas_software_ddraw" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([DirectDraw not found (strict dependencies checking)]) - fi - ] - ) -fi -AC_MSG_CHECKING(whether software directdraw backend will be built) -AC_MSG_RESULT($have_evas_software_ddraw) -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_DDRAW, test "x$have_evas_software_ddraw" = "xyes") +EVAS_CHECK_ENGINE([software-x11], [${want_evas_engine_software_x11}], [yes], [Software X11]) -####################################### -## Check if we should build the 16bit software_ddraw engine -want_evas_software_16_ddraw="auto"; -have_evas_software_16_ddraw="no"; - -AC_MSG_CHECKING(whether 16 bit software directdraw backend is to be built) -AC_ARG_ENABLE(software-16-ddraw, - AC_HELP_STRING([--enable-software-16-ddraw], [enable the 16bit Software DirectDraw rendering backend]), - [ want_evas_software_16_ddraw=$enableval ] -) -AC_MSG_RESULT($want_evas_software_16_ddraw) +EVAS_CHECK_ENGINE([xrender-x11], [${want_evas_engine_xrender_x11}], [yes], [XRender X11]) -if test "x$want_evas_software_16_ddraw" = "xyes" -o "x$want_evas_software_16_ddraw" = "xauto"; then - AC_CHECK_HEADER(ddraw.h, - [ - AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_DDRAW, 1, [16bit Software DirectDraw Rendering Backend]) - ddraw_16_libs="-lddraw -lgdi32" - have_evas_software_16_ddraw="yes" - ], - [ - if test "x$want_evas_software_16_ddraw" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([DirectDraw not found (strict dependencies checking)]) - fi - ] - ) -fi -AC_MSG_CHECKING(whether 16 bits software directdraw backend will be built) -AC_MSG_RESULT($have_evas_software_16_ddraw) -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16_DDRAW, test "x$have_evas_software_16_ddraw" = "xyes") +EVAS_CHECK_ENGINE([gl-x11], [${want_evas_engine_gl_x11}], [yes], [OpenGL X11]) +EVAS_CHECK_ENGINE([glitz-x11], [${want_evas_engine_glitz_x11}], [yes], [Glitz X11]) -####################################### -## Check if we should build the direct3d engine -want_evas_direct3d="auto"; -have_evas_direct3d="no"; - -AC_MSG_CHECKING(whether direct3d backend is to be built) -AC_ARG_ENABLE(direct3d, - AC_HELP_STRING([--enable-direct3d], [enable the Direct3D rendering backend]), - [ want_evas_direct3d=$enableval ] -) -AC_MSG_RESULT($want_evas_direct3d) +EVAS_CHECK_ENGINE([cairo-x11], [${want_evas_engine_cairo_x11}], [yes], [Cairo X11]) -if test "x$want_evas_direct3d" = "xyes"; then - AC_CHECK_HEADERS(d3d9.h d3dx9.h, - [ - AC_DEFINE(BUILD_ENGINE_DIRECT3D, 1, [Direct3D Rendering Backend]) - direct3d_libs="-ld3d9 -ld3dx9d" - have_evas_direct3d="yes" - ], - [ - if test "x$want_evas_direct3d" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([Direct3D not found (strict dependencies checking)]) - fi - ] - ) -fi -AC_MSG_CHECKING(whether direct3d backend will be built) -AC_MSG_RESULT($have_evas_direct3d) -AM_CONDITIONAL(BUILD_ENGINE_DIRECT3D, test "x$have_evas_direct3d" = "xyes") +EVAS_CHECK_ENGINE([software-xcb], [${want_evas_engine_software_xcb}], [no], [Software XCB]) +EVAS_CHECK_ENGINE([xrender-xcb], [${want_evas_engine_xrender_xcb}], [no], [XRender XCB]) -####################################### -## Check if we should build the 16bit software_wince engine -want_evas_software_16_wince="auto"; -have_evas_software_16_wince="no"; - -AC_MSG_CHECKING(whether 16 bit software WinCE backend is to be built) -AC_ARG_ENABLE(software-16-wince, - AC_HELP_STRING([--enable-software-16-wince], [enable the 16bit Software WinCE rendering backend]), - [ want_evas_software_16_wince=$enableval ] -) -AC_MSG_RESULT($want_evas_software_16_wince) +EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no], [Software DirectDraw]) -if test "x$want_evas_software_16_wince" = "xyes" -o "x$want_evas_software_16_wince" = "xauto"; then - AC_CHECK_HEADER(windows.h, - [ - AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_WINCE, 1, [16bit Software WinCE Rendering Backend]) - wince_16_libs="" - have_evas_software_16_wince="yes" - ], - [ - if test "x$want_evas_software_16_wince" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([WinCE not found (strict dependencies checking)]) - fi - ] - ) -fi -AC_MSG_CHECKING(whether 16 bits software WinCE backend will be built) -AC_MSG_RESULT($have_evas_software_16_wince) -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16_WINCE, test "x$have_evas_software_16_wince" = "xyes") +EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D]) +EVAS_CHECK_ENGINE([quartz], [${want_evas_engine_quartz}], [no], [Quartz]) -####################################### -## Check if we should build the software_x11 engine -want_evas_software_x11="auto"; -have_evas_software_x11="no"; - -AC_MSG_CHECKING(whether software x11 backend is to be built) -AC_ARG_ENABLE(software-x11, - AC_HELP_STRING([--disable-software-x11], [disable the Software X11 rendering backend]), - [ want_evas_software_x11=$enableval ] -) -AC_MSG_RESULT($want_evas_software_x11) +EVAS_CHECK_ENGINE([gl-glew], [${want_evas_engine_gl_glew}], [no], [OpenGL Glew]) -if test "x$want_evas_software_x11" = "xyes" -o "x$want_evas_software_x11" = "xauto"; then - AC_PATH_X - AC_PATH_XTRA - AC_CHECK_HEADER(X11/X.h, - [ - AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) - if test "x$want_evas_simple_x11" = "xyes"; then - x_libs="${x_libs} -lX11 -lXext" - else - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" - fi - have_evas_software_x11="yes" - ], - [ - if test "x$want_evas_software_x11" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([X11 not found (strict dependencies checking)]) - fi - ] - ) -fi -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, test "x$have_evas_software_x11" = "xyes") +EVAS_CHECK_ENGINE([software-sdl], [${want_evas_engine_software_sdl}], [no], [Software SDL]) -####################################### -## Check if we should build the software_x11 16bit engine -want_evas_software_16_x11="no"; -have_evas_software_16_x11="no"; - -AC_MSG_CHECKING(whether software 16bit x11 backend is to be built) -AC_ARG_ENABLE(software-16-x11, - AC_HELP_STRING([--enable-software-16-x11], [enable the Software 16bit X11 rendering backend]), - [ want_evas_software_16_x11=$enableval ] -) -AC_MSG_RESULT($want_evas_software_16_x11) +EVAS_CHECK_ENGINE([fb], [${want_evas_engine_fb}], [no], [Framebuffer]) -if test "x$want_evas_software_16_x11" = "xyes"; then - AC_PATH_X - AC_PATH_XTRA - AC_CHECK_HEADER(X11/X.h, - [ - AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend]) - if test "x$want_evas_simple_x11" = "xyes"; then - x_libs="${x_libs} -lX11 -lXext" - else - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" - fi - have_evas_software_16_x11="yes" - ], - [ - if test "x$want_evas_sofware_16_x11" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([X11 not found (strict dependencies checking)]) - fi - ] - ) -fi -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16_X11, test "x$have_evas_software_16_x11" = "xyes") +EVAS_CHECK_ENGINE([directfb], [${want_evas_engine_directfb}], [no], [DirectFB]) -####################################### -## Check if we should build the software_xcb engine -want_evas_software_xcb="no"; -have_evas_software_xcb="no"; - -AC_MSG_CHECKING(whether software xcb backend is to be built) -AC_ARG_ENABLE(software-xcb, - AC_HELP_STRING([--enable-software-xcb], [enable the Software XCB rendering backend]), - [ want_evas_software_xcb=$enableval ] -) -AC_MSG_RESULT($want_evas_software_xcb) +EVAS_CHECK_ENGINE([software-qtopia], [${want_evas_engine_software_qtopia}], [no], [Qtopia]) -if test "x$want_evas_software_xcb" = "xyes"; then - PKG_CHECK_MODULES( - XCB, - xcb xcb-shm xcb-image >= 0.2.1 pixman-1, - [ - AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend]) - have_evas_software_xcb="yes" - ], - [ - if test "x$want_evas_software_xcb" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([XCB not found (strict dependencies checking)]) - fi - ] - ) -fi -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, test "x$have_evas_software_xcb" = "xyes") +EVAS_CHECK_ENGINE([software-16-x11], [${want_evas_engine_software_16_x11}], [yes], [Software X11 16 bits]) -####################################### -## Check if we should build the directfb engine -want_evas_directfb="no"; -have_evas_directfb="no"; - -AC_MSG_CHECKING(whether directfb backend is to be built) -AC_ARG_ENABLE(directfb, - AC_HELP_STRING([--enable-directfb], [enable the DirectFB rendering backend]), - [ want_evas_directfb=$enableval ] -) -AC_MSG_RESULT($want_evas_directfb) - -if test "x$want_evas_directfb" = "xyes"; then - PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16, - [ - AC_DEFINE(BUILD_ENGINE_DIRECTFB, 1, [DirectFB Rendering Backend]) - have_evas_directfb="yes" - ], - [ - if test "x$want_evas_directfb" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([DirectFB not found (strict dependencies checking)]) - fi - ] - ) -fi -AM_CONDITIONAL(BUILD_ENGINE_DIRECTFB, test "x$have_evas_directfb" = "xyes") - -####################################### -## Check if we should build the sdl engine -want_evas_sdl="no"; -have_evas_sdl="no"; -ENGINE_SDL_PRG=""; - -AC_MSG_CHECKING(whether SDL backend is to be built) -AC_ARG_ENABLE(sdl, - AC_HELP_STRING([--enable-sdl], [enable the SDL rendering backend]), - [ want_evas_sdl=$enableval ] -) -AC_MSG_RESULT($want_evas_sdl) - -if test "x$want_evas_sdl" = "xyes"; then - PKG_CHECK_MODULES(SDL, sdl >= 1.2.0, - [ - have_evas_sdl="yes" - ENGINE_SDL_PRG="evas_sdl_test" - AC_DEFINE(BUILD_ENGINE_SDL, 1, [SDL Rendering Backend]) - ], - [ - if test "x$want_evas_sdl" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([SDL not found (strict dependencies checking)]) - fi - ] - ) -fi -AM_CONDITIONAL(BUILD_ENGINE_SDL, test "x$have_evas_sdl" = "xyes") - -## Check if we want to use some SDL primitive -sdl_primitive="no"; - -AC_MSG_CHECKING(whether to use SDL primitive when possible) -AC_ARG_ENABLE(sdl-primitive, - AC_HELP_STRING([--enable-sdl-primitive], []), - [ sdl_primitive=$enableval ] -) -AC_MSG_RESULT($sdl_primitive) - -if test "x$sdl_primitive" = "xyes"; then - AC_DEFINE(ENGINE_SDL_PRIMITIVE, 1, [Use SDL primitive when possible]) -fi +EVAS_CHECK_ENGINE([software-16-ddraw], [${want_evas_engine_software_16_ddraw}], [no], [Software DirectDraw 16 bits]) -####################################### -## Check if we should build the fb engine -want_evas_fb="no"; -have_evas_fb="no"; - -AC_MSG_CHECKING(whether fb backend is to be built) -AC_ARG_ENABLE(fb, - AC_HELP_STRING([--enable-fb], [enable the FB rendering backend]), - [ want_evas_fb=$enableval ] -) -AC_MSG_RESULT($want_evas_fb) +EVAS_CHECK_ENGINE([software-16-wince], [${want_evas_engine_software_16_wince}], [no], [Software Windows CE 16 bits]) -if test "x$want_evas_fb" = "xyes"; then - AC_CHECK_HEADER(linux/fb.h, - [ - AC_DEFINE(BUILD_ENGINE_FB, 1, [Linux FB Rendering Backend]) - have_evas_fb="yes" - ], - [ - if test "x$want_evas_fb" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([FB not found (strict dependencies checking)]) - fi - ] - ) +# common cairo +have_evas_engine_cairo_common="no" +if test "x${have_evas_engine_cairo_x11}" = "xyes" ; then + have_evas_engine_cairo_common="yes" + AC_DEFINE([BUILD_ENGINE_CAIRO_COMMON], [1], [Generic Cairo Rendering Support]) fi -AM_CONDITIONAL(BUILD_ENGINE_FB, test "x$have_evas_fb" = "xyes") - -####################################### -## Check if we should build the buffer engine -want_evas_buffer="yes" -have_evas_buffer="no" - -AC_MSG_CHECKING(whether buffer backend is to be built) -AC_ARG_ENABLE(buffer, - AC_HELP_STRING([--disable-buffer], [disable the Buffer rendering backend]), - [ want_evas_buffer=$enableval ] -) -AC_MSG_RESULT($want_evas_buffer) +AM_CONDITIONAL([BUILD_ENGINE_CAIRO_COMMON], [test "x$have_evas_engine_cairo_common" = "xyes"]) -if test "x$want_evas_buffer" = "xyes"; then - AC_DEFINE(BUILD_ENGINE_BUFFER, 1, [Buffer Rendering Backend]) - have_evas_buffer="yes" +# common gl +have_evas_engine_gl_common="no" +if test "x$have_evas_engine_gl_x11" = "xyes" -o "x$have_evas_engine_gl_glew" = "xyes"; then + AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) + have_evas_engine_gl_common="yes" + evas_engine_gl_common_libs="-lglu32" fi -AM_CONDITIONAL(BUILD_ENGINE_BUFFER, test "x$have_evas_buffer" = "xyes") -####################################### -## Check if we should build the software_qtopia engine -want_evas_qtopia="no"; -have_evas_qtopia="no"; - -AC_MSG_CHECKING(whether software qtopia backend is to be built) -AC_ARG_ENABLE(software-qtopia, - AC_HELP_STRING([--enable-software-qtopia], [enable the Software Qtopia rendering backend]), - [ want_evas_qtopia=$enableval ] -) -AC_MSG_RESULT($want_evas_qtopia) - -if test "x$want_evas_qtopia" = "xyes"; then - AC_LANG_PUSH(C++) - AC_CHECK_HEADER(qdirectpainter_qws.h, - [ - AC_DEFINE(BUILD_ENGINE_SOFTWARE_QTOPIA, 1, [Qtopia Rendering Backend]) - qt_cflags="-fno-exceptions -fno-rtti -I"$qt_dir"/include" - qt_libs="-L"$qt_dir"/lib -lqte -lqpe" - qt_moc=$qt_dir"/bin/moc" - have_evas_qtopia="yes" - ], - [ - if test "x$want_evas_qtopia" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([Qtopia not found (strict dependencies checking)]) - fi - ], - [ - #include - #include - #include - #include - ] - ) - AC_LANG_POP(C++) +if test "x$have_evas_engine_gl_x11" = "xyes" ; then + evas_engine_gl_common_libs="-lGL -lGLU -lpthread" fi -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_QTOPIA, test "x$have_evas_qtopia" = "xyes") - -####################################### -## Check if we should build the gl_x11 engine -want_evas_gl_x11="no"; -have_evas_gl_x11="no"; - -AC_MSG_CHECKING(whether gl x11 backend is to be built) -AC_ARG_ENABLE(gl-x11, - AC_HELP_STRING([--enable-gl-x11], [enable the OpenGL X11 display engine]), - [ want_evas_gl_x11=$enableval ] -) -AC_MSG_RESULT($want_evas_gl_x11) -if test "x$want_evas_gl_x11" = "xyes"; then - AC_PATH_X - AC_PATH_XTRA - AC_CHECK_HEADERS(GL/gl.h GL/glu.h X11/X.h, - [ - AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) - if test "x$want_evas_simple_x11" = "xyes"; then - x_libs="${x_libs} -lX11 -lXext" - else - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" - gl_cflags="-I/usr/include" - fi - gl_libs="-lGL -lGLU -lpthread" - gl_dir="" - have_evas_gl_x11="yes" - ], - [ - if test "x$want_evas_gl_x11" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([OpenGL X11 not found (strict dependencies checking)]) - fi - ] - ) +if test "x$have_evas_engine_gl_glew" = "xyes" ; then + evas_engine_gl_common_libs="-lglu32" fi -AM_CONDITIONAL(BUILD_ENGINE_GL_X11, test "x$have_evas_gl_x11" = "xyes") +AC_SUBST([evas_engine_gl_common_libs]) -####################################### -## Check if we should build the quartz engine -## FIXME: someone more experienced with Autotools-on-OSX: how do Frameworks work with AC_CHECK_HEADERS? -## I want this to detect Cocoa/Cocoa.h, but it's not in the normal include path. -want_evas_quartz="no"; -have_evas_quartz="no"; - -AC_MSG_CHECKING(whether quartz backend is to be built) -AC_ARG_ENABLE(quartz, - AC_HELP_STRING([--enable-quartz], [enable the Quartz display engine]), - [ want_evas_quartz=$enableval ] -) -AC_MSG_RESULT($want_evas_quartz) +AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, test "x$have_evas_engine_gl_common" = "xyes") -if test "x$want_evas_quartz" = "xyes"; then - AC_PATH_X - AC_PATH_XTRA - AC_CHECK_HEADERS(/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h, - [ - have_evas_quartz="yes" - ], - [ - if test "x$want_evas_quartz" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([Quartz not found (strict dependencies checking)]) - fi - ] - ) -fi -AM_CONDITIONAL(BUILD_ENGINE_QUARTZ, test "x$have_evas_quartz" = "xyes") +# SDL primitive +sdl_primitive="no" -####################################### -## Check if we should build the gl_glew engine -want_evas_gl_glew="no"; -have_evas_gl_glew="no"; - -AC_MSG_CHECKING(whether gl glew backend is to be built) -AC_ARG_ENABLE(gl-glew, - AC_HELP_STRING([--enable-gl-glew], [enable the OpenGL Glew display engine]), - [ want_evas_gl_glew=$enableval ] +AC_ARG_ENABLE([sdl-primitive], + [AC_HELP_STRING([--enable-sdl-primitive], [])], + [sdl_primitive=${enableval}] ) -AC_MSG_RESULT($want_evas_gl_glew) +AC_MSG_CHECKING([whether to use SDL primitive when possible]) +AC_MSG_RESULT([${sdl_primitive}]) -if test "x$want_evas_gl_glew" = "xyes" -o "x$want_evas_gl_glew" = "xauto"; then - AC_CHECK_HEADERS(GL/gl.h GL/glu.h GL/glew.h, - [ - AC_DEFINE(BUILD_ENGINE_GL_GLEW, 1, [OpenGL Glew Rendering Backend]) - glew_libs="-lglew32 -lopengl32 -lgdi32" - gl_libs="-lglu32" - have_evas_gl_glew="yes" - ], - [ - if test "x$want_evas_gl_glew" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([OpenGL Glew not found (strict dependencies checking)]) - fi - ] - ) +if test "x${sdl_primitive}" = "xyes" ; then + AC_DEFINE([ENGINE_SDL_PRIMITIVE], [1], [Use SDL primitive when possible]) fi -AC_MSG_CHECKING(whether gl glew backend will be built) -AC_MSG_RESULT($have_evas_gl_glew) -AM_CONDITIONAL(BUILD_ENGINE_GL_GLEW, test "x$have_evas_gl_glew" = "xyes") -# common gl -have_evas_gl_common="no" -if test "x$have_evas_gl_x11" = "xyes" -o "x$have_evas_gl_glew" = "xyes"; then - AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) - have_evas_gl_common="yes" +# if software 16 x11 is enabled - build software_16 (the generic 16bit +# engine). later enable it fb_16 or other "16" bit engines are enabled. +have_evas_engine_software_16="no" +if test "x$have_evas_engine_software_16_x11" = "xyes"; then + have_evas_engine_software_16="yes" fi -AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, test "x$have_evas_gl_common" = "xyes") - -####################################### -## Check if we should build the cairo_x11 engine -have_evas_cairo_common="no"; -want_evas_cairo_x11="no"; -have_evas_cairo_x11="no"; - -#AC_MSG_CHECKING(whether cairo x11 backend is to be built) -#AC_ARG_ENABLE(cairo-x11, -# AC_HELP_STRING([--enable-cairo-x11], [enable the Cairo X11 display engine]), -# [ want_evas_cairo_x11=$enableval ] -#) -#AC_MSG_RESULT($want_evas_cairo_x11) - -if test "x$want_evas_cairo_x11" = "xyes"; then - PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0, - [ - have_evas_cairo_common="yes" - AC_CHECK_HEADER(X11/X.h, - [ - AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) - AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) - if test "x$want_evas_simple_x11" = "xyes"; then - x_libs="${x_libs} -lX11 -lXext" - else - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" - fi - have_evas_cairo_x11="yes" - ], [ - have_evas_cairo_common="no" - have_evas_cairo_x11="no" - ] - ) - ], - [ - have_evas_cairo_common="no" - have_evas_cairo_x11="no" - ] - ) +if test "x$have_evas_engine_software_sdl" = "xyes"; then + have_evas_engine_software_16="yes" fi -AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, test "x$have_evas_cairo_x11" = "xyes") -AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, test "x$have_evas_cairo_common" = "xyes") - -####################################### -## Check if we should build the xrender_x11 engine -want_evas_xrender_x11="auto"; -have_evas_xrender_x11="no"; - -AC_MSG_CHECKING(whether xrender x11 backend is to be built) -AC_ARG_ENABLE(xrender-x11, - AC_HELP_STRING([--disable-xrender-x11], [disable the XRender X11 rendering backend]), - [ want_evas_xrender_x11=$enableval ] -) -AC_MSG_RESULT($want_evas_xrender_x11) - -if test "x$want_evas_xrender_x11" = "xyes" -o "x$want_evas_xrender_x11" = "xauto"; then - AC_PATH_X - AC_PATH_XTRA - AC_CHECK_HEADERS(X11/X.h X11/extensions/Xrender.h, - [ - AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend]) - if test "x$want_evas_simple_x11" = "xyes"; then - x_libs="${x_libs} -lX11 -lXext" - else - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" - fi - have_evas_xrender_x11="yes" - ], - [ - if test "x$want_evas_xrender_x11" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([XRender X11 not found (strict dependencies checking)]) - fi - ] - ) +if test "x$have_evas_engine_software_16_ddraw" = "xyes"; then + have_evas_engine_software_16="yes" fi -AM_CONDITIONAL(BUILD_ENGINE_XRENDER_X11, test "x$have_evas_xrender_x11" = "xyes") - -####################################### -## Check if we should build the xrender_xcb engine -want_evas_xrender_xcb="no"; -have_evas_xrender_xcb="no"; - -AC_MSG_CHECKING(whether xrender xcb backend is to be built) -AC_ARG_ENABLE(xrender-xcb, - AC_HELP_STRING([--enable-xrender-xcb], [enable the Xrender XCB rendering backend]), - [ want_evas_xrender_xcb=$enableval ] -) -AC_MSG_RESULT($want_evas_xrender_xcb) - -if test "x$want_evas_xrender_xcb" = "xyes"; then - PKG_CHECK_MODULES( - XCBRENDER, - xcb xcb-shm xcb-render xcb-image >= 0.2.1, - [ - AC_DEFINE(BUILD_ENGINE_XRENDER_XCB, 1, [Xrender XCB Rendering Backend]) - have_evas_xrender_xcb="yes" - ], - [ - if test "x$want_evas_xrender_xcb" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([XRender XCB not found (strict dependencies checking)]) - fi - ] - ) +if test "x$have_evas_engine_software_16_wince" = "xyes"; then + have_evas_engine_software_16="yes" fi -AM_CONDITIONAL(BUILD_ENGINE_XRENDER_XCB, test "x$have_evas_xrender_xcb" = "xyes") - -####################################### -## Check if we should build the glitz_x11 engine -want_evas_glitz_x11="no"; -have_evas_glitz_x11="no"; - -AC_MSG_CHECKING(whether glitz x11 backend is to be built) -AC_ARG_ENABLE(glitz-x11, - AC_HELP_STRING([--enable-glitz-x11], [enable the Glitz X11 rendering backend]), - [ want_evas_glitz_x11=$enableval ] -) -AC_MSG_RESULT($want_evas_glitz_x11) +AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16, test "x$have_evas_engine_software_16" = "xyes") -if test "x$want_evas_glitz_x11" = "xyes"; then - AC_PATH_X - AC_PATH_XTRA - AC_CHECK_HEADER(X11/X.h, - [ - PKG_CHECK_MODULES(GLITZ, glitz glitz-glx, - [ - if test "x$want_evas_simple_x11" = "xyes"; then - x_libs="${x_libs} -lX11 -lXext" - else - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" - fi - AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend]) - have_evas_glitz_x11="yes" - ], - [ - if test "x$want_evas_glitz_gl_x11" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([Glitz X11 not found (strict dependencies checking)]) - fi - ] - ) - ], - [ - if test "x$want_evas_glitz_gl_x11" = "xyes" -a "x$use_strict" = "xyes" ; then - AC_MSG_ERROR([Glitz X11 not found (strict dependencies checking)]) - fi - ] - ) -fi -AM_CONDITIONAL(BUILD_ENGINE_GLITZ_X11, test "x$have_evas_glitz_x11" = "xyes") ##################################################################### ## Image loaders -EVAS_CHECK_IMAGE_LOADER([Edb], [yes]) +EVAS_CHECK_IMAGE_LOADER([Edb], [${want_evas_image_loader_edb}]) -EVAS_CHECK_IMAGE_LOADER([Eet], [yes]) -EVAS_CHECK_FONT_LOADER([yes]) +EVAS_CHECK_IMAGE_LOADER([Eet], [${want_evas_image_loader_eet}]) +EVAS_CHECK_FONT_LOADER([${want_evas_font_loader_eet}]) -EVAS_CHECK_IMAGE_LOADER([Gif], [yes]) +EVAS_CHECK_IMAGE_LOADER([Gif], [${want_evas_image_loader_gif}]) have_evas_image_saver_jpeg="no" -EVAS_CHECK_IMAGE_LOADER([Jpeg], [yes]) +EVAS_CHECK_IMAGE_LOADER([Jpeg], [${want_evas_image_loader_jpeg}]) dnl Windows has no sigsetjmp function, nor equivalent. dnl So we disable the jpeg saver. @@ -851,15 +338,15 @@ case "$host_os" in esac AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"]) -EVAS_CHECK_IMAGE_LOADER([PMAPS], [yes]) +EVAS_CHECK_IMAGE_LOADER([PMAPS], [${want_evas_image_loader_pmaps}]) -EVAS_CHECK_IMAGE_LOADER([PNG], [yes]) +EVAS_CHECK_IMAGE_LOADER([PNG], [${want_evas_image_loader_png}]) -EVAS_CHECK_IMAGE_LOADER([SVG], [yes]) +EVAS_CHECK_IMAGE_LOADER([SVG], [${want_evas_image_loader_svg}]) -EVAS_CHECK_IMAGE_LOADER([Tiff], [yes]) +EVAS_CHECK_IMAGE_LOADER([Tiff], [${want_evas_image_loader_tiff}]) -EVAS_CHECK_IMAGE_LOADER([XPM], [yes]) +EVAS_CHECK_IMAGE_LOADER([XPM], [${want_evas_image_loader_xpm}]) ##################################################################### @@ -1410,49 +897,14 @@ if test x$want_valgrind = "xyes"; then ) fi -### if software 16 x11 is enabled - build software_16 (the generic 16bit -### engine). later enable it fb_16 or other "16" bit engines are enabled. -have_evas_software_16="no" -if test "x$have_evas_software_16_x11" = "xyes"; then - have_evas_software_16="yes" -fi -if test "x$have_evas_sdl" = "xyes"; then - have_evas_software_16="yes" -fi -if test "x$have_evas_software_16_ddraw" = "xyes"; then - have_evas_software_16="yes" -fi -if test "x$have_evas_software_16_wince" = "xyes"; then - have_evas_software_16="yes" -fi -AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16, test "x$have_evas_software_16" = "xyes") - ##################################################################### ## Fill in flags -AC_SUBST(ddraw_libs) -AC_SUBST(ddraw_16_libs) -AC_SUBST(direct3d_libs) - -AC_SUBST(glew_libs) - -AC_SUBST(x_cflags) -AC_SUBST(x_libs) - -AC_SUBST(gl_cflags) -AC_SUBST(gl_libs) - -AC_SUBST(quartz_cflags) -AC_SUBST(quartz_libs) - -AC_SUBST(qt_cflags) -AC_SUBST(qt_libs) -AC_SUBST(qt_moc) - AC_SUBST(altivec_cflags) AC_SUBST(pthread_cflags) AC_SUBST(pthread_libs) + ##################################################################### ## Output @@ -1555,27 +1007,27 @@ echo echo "Configuration Options Summary:" echo echo "Engines:" -echo " Software Memory Buffer.....: $have_evas_buffer" -echo " Software X11...............: $have_evas_software_x11" -echo " XRender X11................: $have_evas_xrender_x11" -echo " OpenGL X11.................: $have_evas_gl_x11" -echo " Glitz X11..................: $have_evas_glitz_x11" -echo " Cairo X11..................: $have_evas_cairo_x11" -echo " Software XCB...............: $have_evas_software_xcb" -echo " XRender XCB................: $have_evas_xrender_xcb" -echo " Software DirectDraw........: $have_evas_software_ddraw" -echo " Direct3d...................: $have_evas_direct3d" -echo " Quartz.....................: $have_evas_quartz" -echo " OpenGL Glew................: $have_evas_gl_glew" -echo " Software SDL...............: $have_evas_sdl (primitive: $sdl_primitive)" -echo " Software Framebuffer.......: $have_evas_fb" -echo " Software Qtopia............: $have_evas_qtopia" -echo " Software 16bit ............: $have_evas_software_16" -echo " Software 16bit X11.........: $have_evas_software_16_x11" -echo " Software 16bit Directdraw..: $have_evas_software_16_ddraw" -echo " Software 16bit WinCE.......: $have_evas_software_16_wince" -echo " Software 16bit SDL.........: $have_evas_sdl (primitive: $sdl_primitive)" -echo " DirectFB...................: $have_evas_directfb" +echo " Software Memory Buffer.....: $have_evas_engine_buffer" +echo " Software X11...............: $have_evas_engine_software_x11" +echo " XRender X11................: $have_evas_engine_xrender_x11" +echo " OpenGL X11.................: $have_evas_engine_gl_x11" +echo " Glitz X11..................: $have_evas_engine_glitz_x11" +echo " Cairo X11..................: $have_evas_engine_cairo_x11" +echo " Software XCB...............: $have_evas_engine_software_xcb" +echo " XRender XCB................: $have_evas_engine_xrender_xcb" +echo " Software DirectDraw........: $have_evas_engine_software_ddraw" +echo " Direct3d...................: $have_evas_engine_direct3d" +echo " Quartz.....................: $have_evas_engine_quartz" +echo " OpenGL Glew................: $have_evas_engine_gl_glew" +echo " Software SDL...............: $have_evas_engine_software_sdl (primitive: $sdl_primitive)" +echo " Software Framebuffer.......: $have_evas_engine_fb" +echo " DirectFB...................: $have_evas_engine_directfb" +echo " Software Qtopia............: $have_evas_engine_software_qtopia" +echo " Software 16bit ............: $have_evas_engine_software_16" +echo " Software 16bit X11.........: $have_evas_engine_software_16_x11" +echo " Software 16bit Directdraw..: $have_evas_engine_software_16_ddraw" +echo " Software 16bit WinCE.......: $have_evas_engine_software_16_wince" +echo " Software 16bit SDL.........: $have_evas_engine_software_sdl (primitive: $sdl_primitive)" # FIXME: opengl engine needs to be fixed and tested lots for all drivers # FIXME: xrender engine to be written echo diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 new file mode 100644 index 0000000..3b6efc1 --- /dev/null +++ b/m4/evas_check_engine.m4 @@ -0,0 +1,635 @@ + +dnl use: EVAS_CHECK_ENGINE_DEP_BUFFER(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_BUFFER], +[ + +have_dep="yes" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_X11], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_PATH_X +AC_PATH_XTRA + +AC_CHECK_HEADER([X11/X.h], [have_dep="yes"]) + +if test "x${have_dep}" = "xyes" ; then + if test "x$2" = "xyes" ; then + x_libs="${x_libs} -lX11 -lXext" + else + x_dir=${x_dir:-/usr/X11R6} + x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} + x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + fi + evas_engine_[]$1[]_cflags="${x_cflags}" + evas_engine_[]$1[]_libs="${x_libs}" +fi + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_XRENDER_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_XRENDER_X11], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_PATH_X +AC_PATH_XTRA + +AC_CHECK_HEADERS([X11/X.h X11/extensions/Xrender.h], [have_dep="yes"]) + +if test "x${have_dep}" = "xyes" ; then + if test "x$2" = "xyes" ; then + x_libs="${x_libs} -lX11 -lXext" + else + x_dir=${x_dir:-/usr/X11R6} + x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} + x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + fi + evas_engine_[]$1[]_cflags="${x_cflags}" + evas_engine_[]$1[]_libs="${x_libs} -lXrender" +fi + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_GL_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_X11], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_PATH_X +AC_PATH_XTRA + +AC_CHECK_HEADERS([GL/gl.h GL/glu.h X11/X.h], [have_dep="yes"]) + +if test "x${have_dep}" = "xyes" ; then + if test "x$2" = "xyes" ; then + x_libs="${x_libs} -lX11 -lXext" + else + x_dir=${x_dir:-/usr/X11R6} + x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} + x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + fi + evas_engine_[]$1[]_cflags="-I/usr/include ${x_cflags}" + evas_engine_[]$1[]_libs="${x_libs} -lGL -lGLU -lpthread" +fi + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_GLITZ_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GLITZ_X11], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_PATH_X +AC_PATH_XTRA + +AC_CHECK_HEADER([X11/X.h], + [PKG_CHECK_MODULES([GLITZ], + [glitz glitz-glx], + [have_dep="yes"] + )] +) + +if test "x${have_dep}" = "xyes" ; then + if test "x$2" = "xyes" ; then + x_libs="${x_libs} -lX11 -lXext" + else + x_dir=${x_dir:-/usr/X11R6} + x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} + x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + fi + evas_engine_[]$1[]_cflags="${GLITZ_CFLAGS} ${x_cflags}" + evas_engine_[]$1[]_libs="${GLITZ_LIBS} ${x_libs}" +fi + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_CAIRO_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_CAIRO_X11], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_PATH_X +AC_PATH_XTRA + +AC_CHECK_HEADER([X11/X.h], + [PKG_CHECK_MODULES([CAIRO], + [cairo >= 1.0.0], + [have_dep="yes"] + )] +) + +if test "x${have_dep}" = "xyes" ; then + if test "x$2" = "xyes" ; then + x_libs="${x_libs} -lX11 -lXext" + else + x_dir=${x_dir:-/usr/X11R6} + x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} + x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + fi + evas_engine_[]$1[]_cflags="${CAIRO_CFLAGS} ${x_cflags}" + evas_engine_[]$1[]_libs="${CAIRO_LIBS} ${x_libs}" +fi + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_XCB], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +PKG_CHECK_MODULES([XCB], + [xcb xcb-shm xcb-image >= 0.2.1 pixman-1], + [ + have_dep="yes" + evas_engine_[]$1[]_cflags="${XCB_CFLAGS}" + evas_engine_[]$1[]_libs="${XCB_LIBS}" + ] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_XRENDER_XCB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_XRENDER_XCB], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +PKG_CHECK_MODULES([XCBRENDER], + [xcb xcb-shm xcb-render xcb-image >= 0.2.1 pixman-1], + [ + have_dep="yes" + evas_engine_[]$1[]_cflags="${XCBRENDER_CFLAGS}" + evas_engine_[]$1[]_libs="${XCBRENDER_LIBS}" + ] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_DDRAW(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_DDRAW], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_CHECK_HEADER([ddraw.h], + [ + have_dep="yes" + evas_engine_[]$1[]_libs="-lddraw" + ] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_DIRECT3D(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECT3D], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_CHECK_HEADERS([d3d9.h d3dx9.h.h], + [ + have_dep="yes" + evas_engine_[]$1[]_libs="-ld3d9 -ld3dx9d" + ] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_QUARTZ(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_QUARTZ], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_CHECK_HEADERS([/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h], + [have_dep="yes"] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_GL_GLEW(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_GLEW], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glew.h], + [ + have_dep="yes" + evas_engine_[]$1[]_libs="-lglu32 -lglew32 -lopengl32 -lgdi32" + ] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_SDL], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +PKG_CHECK_MODULES([SDL], + [sdl >= 1.2.0], + [ + have_dep="yes" + evas_engine_[]$1[]_cflags="${SDL_CFLAGS}" + evas_engine_[]$1[]_libs="${SDL_LIBS}" + ] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_FB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_FB], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_CHECK_HEADER([linux/fb.h], [have_dep="yes"]) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_DIRECTFB(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_DIRECTFB], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +PKG_CHECK_MODULES([DIRECTFB], + [directfb >= 0.9.16], + [ + have_dep="yes" + evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}" + evas_engine_[]$1[]_libs="${DIRECTFB_LIBS}" + ] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_QTOPIA(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_QTOPIA], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" +evas_engine_[]$1[]_moc="" + +AC_ARG_WITH([qtdir], + [AC_HELP_STRING([--with-qtdir=QT_DIR], [use qt directory specified])], + [ + qt_dir=$withval; + echo "using "$qt_dir" for qt directory."; + ], + [qt_dir="/opt/Qtopia"] +) + +AC_LANG_PUSH(C++) + +AC_CHECK_HEADER([qdirectpainter_qws.h], + [have_dep="yes"], + [have_dep="no"], + [ +#include +#include +#include +#include + ] +) + +AC_LANG_POP(C++) + +if test "x${have_dep}" = "xyes" ; then + evas_engine_[]$1[]_cflags="-fno-exceptions -fno-rtti -I${qt_dir}/include" + evas_engine_[]$1[]_libs="-L${qt_dir}/lib -lqte -lqpe" + evas_engine_[]$1[]_moc="${qt_dir}/bin/moc" +fi + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) +AC_SUBST([evas_engine_$1_moc]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_X11(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_X11], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_PATH_X +AC_PATH_XTRA + +AC_CHECK_HEADER([X11/X.h], [have_dep="yes"]) + +if test "x${have_dep}" = "xyes" ; then + if test "x$2" = "xyes" ; then + x_libs="${x_libs} -lX11 -lXext" + else + x_dir=${x_dir:-/usr/X11R6} + x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} + x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" + fi + evas_engine_[]$1[]_cflags="${x_cflags}" + evas_engine_[]$1[]_libs="${x_libs}" +fi + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_DDRAW(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_DDRAW], +[ + +have_dep="no" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_CHECK_HEADER([ddraw.h], + [ + have_dep="yes" + evas_engine_[]$1[]_libs="-lddraw -lgdi32" + ] +) + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_WINCE(engine, simple[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) + +AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_16_WINCE], +[ + +have_dep="yes" +evas_engine_[]$1[]_cflags="" +evas_engine_[]$1[]_libs="" + +AC_SUBST([evas_engine_$1_cflags]) +AC_SUBST([evas_engine_$1_libs]) + +if test "x${have_dep}" = "xyes" ; then + m4_default([$3], [:]) +else + m4_default([$4], [:]) +fi + +]) + +dnl use: EVAS_CHECK_ENGINE(engine, want_engine, simple, description) + + +AC_DEFUN([EVAS_CHECK_ENGINE], +[ + +m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl +m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl + +want_engine="$2" +have_evas_engine_[]DOWN="no" + +AC_ARG_ENABLE([$1], + [AC_HELP_STRING([--enable-$1], [disable $4 rendering backend])], + [want_engine=${enableval}] +) + +AC_MSG_CHECKING([whether to enable $4 rendering backend]) +AC_MSG_RESULT([${want_engine}]) + +if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xauto"; then + m4_default([EVAS_CHECK_ENGINE_DEP_]m4_defn([UP]))(DOWN, $3, [have_evas_engine_[]DOWN="yes"], [have_evas_engine_[]DOWN="no"]) +fi + +if test "x${have_evas_engine_[]DOWN}" = "xno" -a "x${want_engine}" = "xyes" -a "x${use_strict}" = "xyes" ; then + AC_MSG_ERROR([$4 dependencies not found (strict dependencies checking)]) +fi + +AC_MSG_CHECKING([whether $4 rendering backend will be built]) +AC_MSG_RESULT([${have_evas_engine_[]DOWN}]) + +if test "x${have_evas_engine_[]DOWN}" = "xyes" ; then + AC_DEFINE(BUILD_ENGINE_[]UP, [1], [$4 rendering backend]) +fi + +AM_CONDITIONAL(BUILD_ENGINE_[]UP, [test "x${have_evas_engine_[]DOWN}" = "xyes"]) + +m4_popdef([UP], [DOWN]) + +]) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 69bf783..ea1f082 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -55,5 +55,5 @@ libevas_la_DEPENDENCIES += engines/common_16/libevas_engine_common_16.la endif -libevas_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ +libevas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ diff --git a/src/lib/canvas/evas_main.c b/src/lib/canvas/evas_main.c index ada1185..f4250d6 100644 --- a/src/lib/canvas/evas_main.c +++ b/src/lib/canvas/evas_main.c @@ -774,7 +774,7 @@ evas_render_method_list(void) #ifdef BUILD_ENGINE_SOFTWARE_QTOPIA methods = eina_list_append(methods, strdup("software_qtopia")); #endif -#ifdef BUILD_ENGINE_SDL +#ifdef BUILD_ENGINE_SOFTWARE_SDL methods = eina_list_append(methods, strdup("software_sdl")); #endif diff --git a/src/modules/engines/buffer/Makefile.am b/src/modules/engines/buffer/Makefile.am index cd10b68..7d9b7c9 100644 --- a/src/modules/engines/buffer/Makefile.am +++ b/src/modules/engines/buffer/Makefile.am @@ -21,8 +21,8 @@ module_la_SOURCES = \ evas_engine.c \ evas_outbuf.c -module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static include_HEADERS = Evas_Engine_Buffer.h diff --git a/src/modules/engines/cairo_common/Makefile.am b/src/modules/engines/cairo_common/Makefile.am index 5c4a7cc..4ff6654 100644 --- a/src/modules/engines/cairo_common/Makefile.am +++ b/src/modules/engines/cairo_common/Makefile.am @@ -14,10 +14,12 @@ if BUILD_ENGINE_CAIRO_COMMON noinst_LTLIBRARIES = libevas_engine_cairo_common.la libevas_engine_cairo_common_la_SOURCES = \ -evas_cairo_private.h \ -evas_cairo_common.h \ evas_cairo_main.c libevas_engine_cairo_common_la_LIBADD = @EINA_LIBS@ @CAIRO_LIBS@ $(top_builddir)/src/lib/libevas.la endif + +EXTRA_DIST = \ +evas_cairo_private.h \ +evas_cairo_common.h diff --git a/src/modules/engines/cairo_x11/Makefile.am b/src/modules/engines/cairo_x11/Makefile.am index dc39e22..e1dcc4d 100644 --- a/src/modules/engines/cairo_x11/Makefile.am +++ b/src/modules/engines/cairo_x11/Makefile.am @@ -7,8 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines/cairo_common \ @FREETYPE_CFLAGS@ \ -@x_cflags@ \ -@CAIRO_CFLAGS@ \ +@evas_engine_cairo_x11_cflags@ \ @EINA_CFLAGS@ if BUILD_ENGINE_CAIRO_X11 @@ -18,11 +17,10 @@ pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_x_main.c -module_la_LIBADD = @EINA_LIBS@ @CAIRO_LIBS@ @x_libs@ $(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_cairo_x11_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 module_la_LIBTOOLFLAGS = --tag=disable-static @@ -30,8 +28,4 @@ include_HEADERS = Evas_Engine_Cairo_X11.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_x_main.c \ -Evas_Engine_Cairo_X11.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/direct3d/Makefile.am b/src/modules/engines/direct3d/Makefile.am index e81842e..ae826b4 100644 --- a/src/modules/engines/direct3d/Makefile.am +++ b/src/modules/engines/direct3d/Makefile.am @@ -7,7 +7,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @EINA_CFLAGS@ \ -@FREETYPE_CFLAGS@ +@FREETYPE_CFLAGS@ \ +@evas_engine_direct3d_cflags@ if BUILD_ENGINE_DIRECT3D @@ -15,25 +16,18 @@ pkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_outbuf.c \ evas_direct3d_buffer.c \ evas_direct3d_main.cpp module_la_CXXFLAGS = -fno-rtti -fno-exceptions -module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la @direct3d_libs@ -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_direct3d_libs@ +module_la_LDFLAGS = -no-undefined -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static include_HEADERS = Evas_Engine_Direct3D.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_outbuf.c \ -evas_direct3d_buffer.c \ -evas_direct3d_main.cpp \ -Evas_Engine_Direct3D.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/directfb/Makefile.am b/src/modules/engines/directfb/Makefile.am index fed6b50..a6bee07 100644 --- a/src/modules/engines/directfb/Makefile.am +++ b/src/modules/engines/directfb/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@DIRECTFB_CFLAGS@ +@evas_engine_directfb_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -20,8 +20,8 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_engine.c polygon.c -module_la_LIBADD = @EINA_LIBS@ @DIRECTFB_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LIBADD = @EINA_LIBS@ @evas_engine_directfb_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static include_HEADERS = Evas_Engine_DirectFB.h diff --git a/src/modules/engines/fb/Makefile.am b/src/modules/engines/fb/Makefile.am index f8c858e..327e96f 100644 --- a/src/modules/engines/fb/Makefile.am +++ b/src/modules/engines/fb/Makefile.am @@ -7,7 +7,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ -@EINA_CFLAGS@ +@EINA_CFLAGS@ \ +@evas_engine_fb_cflags@ if BUILD_ENGINE_FB @@ -15,16 +16,13 @@ pkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ -evas_fb.h \ evas_engine.c \ evas_fb_main.c \ evas_outbuf.c -module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_fb_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_FB.h @@ -32,8 +30,4 @@ endif EXTRA_DIST = \ evas_engine.h \ -evas_fb.h \ -evas_engine.c \ -evas_fb_main.c \ -evas_outbuf.c \ -Evas_Engine_FB.h +evas_fb.h diff --git a/src/modules/engines/gl_common/Makefile.am b/src/modules/engines/gl_common/Makefile.am index 9f6e9ff..1249f9e 100644 --- a/src/modules/engines/gl_common/Makefile.am +++ b/src/modules/engines/gl_common/Makefile.am @@ -6,15 +6,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ -@EINA_CFLAGS@ \ -@gl_cflags@ +@EINA_CFLAGS@ if BUILD_ENGINE_GL_COMMON noinst_LTLIBRARIES = libevas_engine_gl_common.la libevas_engine_gl_common_la_SOURCES = \ -evas_gl_private.h \ -evas_gl_common.h \ evas_gl_context.c \ evas_gl_font.c \ evas_gl_gradient.c \ @@ -25,17 +22,9 @@ evas_gl_polygon.c \ evas_gl_rectangle.c \ evas_gl_texture.c -libevas_engine_gl_common_la_LIBADD = @EINA_LIBS@ @gl_libs@ $(top_builddir)/src/lib/libevas.la +libevas_engine_gl_common_la_LIBADD = @EINA_LIBS@ @evas_engine_gl_common_libs@ $(top_builddir)/src/lib/libevas.la endif EXTRA_DIST = \ evas_gl_private.h \ -evas_gl_context.c \ -evas_gl_font.c \ -evas_gl_gradient.c \ -evas_gl_image.c \ -evas_gl_line.c \ -evas_gl_misc.c \ -evas_gl_polygon.c \ -evas_gl_rectangle.c \ -evas_gl_texture.c +evas_gl_common.h diff --git a/src/modules/engines/gl_glew/Makefile.am b/src/modules/engines/gl_glew/Makefile.am index 2999a0f..1cf4585 100644 --- a/src/modules/engines/gl_glew/Makefile.am +++ b/src/modules/engines/gl_glew/Makefile.am @@ -7,7 +7,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines/gl_common \ @EINA_CFLAGS@ \ -@FREETYPE_CFLAGS@ +@FREETYPE_CFLAGS@ \ +@evas_engine_gl_glew_cflags@ if BUILD_ENGINE_GL_GLEW @@ -16,20 +17,15 @@ pkgdir = $(libdir)/evas/modules/engines/gl_glew/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_glew_main.c -module_la_LIBADD = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la @gl_libs@ @glew_libs@ -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LIBADD = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la @evas_engine_gl_glew_libs@ +module_la_LDFLAGS = -no-undefined -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static include_HEADERS = Evas_Engine_GL_Glew.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_glew_main.c \ -Evas_Engine_GL_Glew.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/gl_x11/Makefile.am b/src/modules/engines/gl_x11/Makefile.am index 480df4e..d69f6bf 100644 --- a/src/modules/engines/gl_x11/Makefile.am +++ b/src/modules/engines/gl_x11/Makefile.am @@ -8,8 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines/gl_common \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@x_cflags@ \ -@gl_cflags@ +@evas_engine_gl_x11_cflags@ if BUILD_ENGINE_GL_X11 @@ -18,11 +17,10 @@ pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_x_main.c -module_la_LIBADD = @EINA_LIBS@ @gl_libs@ @x_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_gl_x11_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -30,8 +28,4 @@ include_HEADERS = Evas_Engine_GL_X11.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_x_main.c \ -Evas_Engine_GL_X11.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/glitz_x11/Makefile.am b/src/modules/engines/glitz_x11/Makefile.am index 2fa3f68..bc23068 100644 --- a/src/modules/engines/glitz_x11/Makefile.am +++ b/src/modules/engines/glitz_x11/Makefile.am @@ -8,8 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@x_cflags@ \ -@GLITZ_CFLAGS@ +@evas_engine_glitz_cflags@ if BUILD_ENGINE_GLITZ_X11 @@ -17,7 +16,6 @@ pkgdir = $(libdir)/evas/modules/engines/glitz_x11/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_engine_ximage.c \ evas_engine_glitz.c \ @@ -25,7 +23,7 @@ evas_engine_image.c \ evas_engine_font.c \ evas_engine_gradient.c -module_la_LIBADD = @EINA_LIBS@ @x_libs@ @GLITZ_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_glitz_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -33,12 +31,4 @@ include_HEADERS = Evas_Engine_Glitz_X11.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_engine_ximage.c \ -evas_engine_glitz.c \ -evas_engine_image.c \ -evas_engine_font.c \ -evas_engine_gradient.c \ -Evas_Engine_Glitz_X11.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/quartz/Makefile.am b/src/modules/engines/quartz/Makefile.am index 6332911..fd59260 100644 --- a/src/modules/engines/quartz/Makefile.am +++ b/src/modules/engines/quartz/Makefile.am @@ -1,7 +1,13 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @quartz_cflags@ @FREETYPE_CFLAGS@ @EINA_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@evas_engine_quartz_cflags@ \ +@FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ if BUILD_ENGINE_QUARTZ @@ -9,11 +15,9 @@ pkgdir = $(libdir)/evas/modules/engines/quartz/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la -module_la_SOURCES = \ -evas_engine.h \ -evas_engine.c +module_la_SOURCES = evas_engine.c -module_la_LIBADD = @EINA_LIBS@ @quartz_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_quartz_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -23,5 +27,4 @@ endif EXTRA_DIST = \ evas_engine.h \ -evas_engine.c \ -Evas_Engine_Quartz.h +evas_quartz_private.h diff --git a/src/modules/engines/software_16/Makefile.am b/src/modules/engines/software_16/Makefile.am index 5182ebd..61dd4b6 100644 --- a/src/modules/engines/software_16/Makefile.am +++ b/src/modules/engines/software_16/Makefile.am @@ -20,7 +20,7 @@ module_la_SOURCES = \ evas_engine.c module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static endif diff --git a/src/modules/engines/software_16_ddraw/Makefile.am b/src/modules/engines/software_16_ddraw/Makefile.am index dac0867..fa1f766 100644 --- a/src/modules/engines/software_16_ddraw/Makefile.am +++ b/src/modules/engines/software_16_ddraw/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ -I$(top_srcdir)/src/modules/engines/software_16 \ @EINA_CFLAGS@ \ -@FREETYPE_CFLAGS@ +@FREETYPE_CFLAGS@ \ +@evas_engine_software_16_ddraw_cflags@ if BUILD_ENGINE_SOFTWARE_16_DDRAW @@ -17,23 +18,17 @@ pkgdir = $(libdir)/evas/modules/engines/software_16_ddraw/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_ddraw_buffer.cpp \ evas_ddraw_main.cpp module_la_CXXFLAGS = -fno-rtti -fno-exceptions -module_la_LIBADD = @EINA_LIBS@ @ddraw_16_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_software_16_ddraw_libs@ +module_la_LDFLAGS = -no-undefined -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static include_HEADERS = Evas_Engine_Software_16_DDraw.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_ddraw_buffer.cpp \ -evas_ddraw_main.cpp \ -Evas_Engine_Software_16_DDraw.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/software_16_sdl/Makefile.am b/src/modules/engines/software_16_sdl/Makefile.am index 8516815..a00ce3c 100644 --- a/src/modules/engines/software_16_sdl/Makefile.am +++ b/src/modules/engines/software_16_sdl/Makefile.am @@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ -if BUILD_ENGINE_SDL +if BUILD_ENGINE_SOFTWARE_SDL pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) @@ -15,7 +15,7 @@ evas_engine.c \ evas_engine.h module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs +module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs include_HEADERS = Evas_Engine_SDL_16.h diff --git a/src/modules/engines/software_16_wince/Makefile.am b/src/modules/engines/software_16_wince/Makefile.am index f4ad012..69de313 100644 --- a/src/modules/engines/software_16_wince/Makefile.am +++ b/src/modules/engines/software_16_wince/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ -I$(top_srcdir)/src/modules/engines/software_16 \ @EINA_CFLAGS@ \ -@FREETYPE_CFLAGS@ +@FREETYPE_CFLAGS@ \ +@evas_engine_software_16_wince_cflags@ .rc.lo: $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) $< -o $@ @@ -20,7 +21,6 @@ pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_wince_ddraw_buffer.cpp \ evas_wince_fb_buffer.c \ @@ -30,10 +30,12 @@ evas_wince_gapi.rc module_la_CFLAGS = @WIN32_CFLAGS@ module_la_CXXFLAGS = -fno-rtti -fno-exceptions -module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la @evas_engine_software_16_wince_libs@ +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static include_HEADERS = Evas_Engine_Software_16_WinCE.h endif + +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/software_16_x11/Makefile.am b/src/modules/engines/software_16_x11/Makefile.am index 4ceaca6..4173d6e 100644 --- a/src/modules/engines/software_16_x11/Makefile.am +++ b/src/modules/engines/software_16_x11/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines/software_16 \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@x_cflags@ +@evas_engine_software_16_x11_cflags@ if BUILD_ENGINE_SOFTWARE_16_X11 @@ -18,11 +18,10 @@ pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_x_buffer.c -module_la_LIBADD = @EINA_LIBS@ @x_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_software_16_x11_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -30,8 +29,4 @@ include_HEADERS = Evas_Engine_Software_16_X11.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_x_buffer.c \ -Evas_Engine_Software_16_X11.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/software_ddraw/Makefile.am b/src/modules/engines/software_ddraw/Makefile.am index 14d477a..72cbe7a 100644 --- a/src/modules/engines/software_ddraw/Makefile.am +++ b/src/modules/engines/software_ddraw/Makefile.am @@ -7,7 +7,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @EINA_CFLAGS@ \ -@FREETYPE_CFLAGS@ +@FREETYPE_CFLAGS@ \ +@evas_engine_software_ddraw_cflags@ if BUILD_ENGINE_SOFTWARE_DDRAW @@ -15,25 +16,18 @@ pkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_outbuf.c \ evas_ddraw_buffer.c \ evas_ddraw_main.cpp module_la_CXXFLAGS = -fno-rtti -fno-exceptions -module_la_LIBADD = @EINA_LIBS@ @ddraw_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LIBADD = @EINA_LIBS@ @evas_engine_software_ddraw_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LDFLAGS = -no-undefined -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static include_HEADERS = Evas_Engine_Software_DDraw.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_outbuf.c \ -evas_ddraw_buffer.c \ -evas_ddraw_main.cpp \ -Evas_Engine_Software_DDraw.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/software_generic/Makefile.am b/src/modules/engines/software_generic/Makefile.am index a9de4e9..3c4a5e5 100644 --- a/src/modules/engines/software_generic/Makefile.am +++ b/src/modules/engines/software_generic/Makefile.am @@ -18,5 +18,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_engine.c module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/engines/software_qtopia/Makefile.am b/src/modules/engines/software_qtopia/Makefile.am index f723b5a..8998b12 100644 --- a/src/modules/engines/software_qtopia/Makefile.am +++ b/src/modules/engines/software_qtopia/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@qt_cflags@ +@evas_engine_software_qtopia_cflags@ AM_CXXFLAGS = $(CFLAGS) -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -DNO_DEBUG @@ -18,12 +18,11 @@ pkgdir = $(libdir)/evas/modules/engines/software_qtopia/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_outbuf.c \ evas_qt_main.cpp -module_la_LIBADD = @EINA_LIBS@ @qt_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_software_qtopia_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -31,9 +30,4 @@ include_HEADERS = Evas_Engine_Software_Qtopia.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_outbuf.c \ -evas_qt_main.cpp \ -Evas_Engine_Software_Qtopia.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/software_sdl/Makefile.am b/src/modules/engines/software_sdl/Makefile.am index 27c87ca..1962683 100644 --- a/src/modules/engines/software_sdl/Makefile.am +++ b/src/modules/engines/software_sdl/Makefile.am @@ -8,11 +8,11 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@SDL_CFLAGS@ +@evas_engine_software_sdl_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ -if BUILD_ENGINE_SDL +if BUILD_ENGINE_SOFTWARE_SDL pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH) @@ -20,8 +20,8 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_engine.c -module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_software_sdl_libs@ +module_la_LDFLAGS = -no-undefined -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static include_HEADERS = Evas_Engine_SDL.h diff --git a/src/modules/engines/software_x11/Evas_Engine_Software_X11.h b/src/modules/engines/software_x11/Evas_Engine_Software_X11.h index 1f1df60..1cf972b 100644 --- a/src/modules/engines/software_x11/Evas_Engine_Software_X11.h +++ b/src/modules/engines/software_x11/Evas_Engine_Software_X11.h @@ -35,9 +35,10 @@ struct _Evas_Engine_Info_Software_X11 Colormap (*best_colormap_get) (Display *disp, int screen); int (*best_depth_get) (Display *disp, int screen); } func; - + int mask_changed; }; + #endif diff --git a/src/modules/engines/software_x11/Makefile.am b/src/modules/engines/software_x11/Makefile.am index f9b08b1..01fd759 100644 --- a/src/modules/engines/software_x11/Makefile.am +++ b/src/modules/engines/software_x11/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@x_cflags@ +@evas_engine_software_x11_cflags@ if BUILD_ENGINE_SOFTWARE_X11 @@ -17,14 +17,13 @@ pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_outbuf.c \ evas_x_buffer.c \ evas_x_color.c \ evas_x_main.c -module_la_LIBADD = @EINA_LIBS@ @x_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_software_x11_libs@ module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -32,11 +31,4 @@ include_HEADERS = Evas_Engine_Software_X11.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_outbuf.c \ -evas_x_buffer.c \ -evas_x_color.c \ -evas_x_main.c \ -Evas_Engine_Software_X11.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/software_xcb/Makefile.am b/src/modules/engines/software_xcb/Makefile.am index c9ad478..2a91337 100644 --- a/src/modules/engines/software_xcb/Makefile.am +++ b/src/modules/engines/software_xcb/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@XCB_CFLAGS@ +@evas_engine_software_xcb_cflags@ if BUILD_ENGINE_SOFTWARE_XCB @@ -17,14 +17,13 @@ pkgdir = $(libdir)/evas/modules/engines/software_xcb/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_outbuf.c \ evas_xcb_buffer.c \ evas_xcb_color.c \ evas_xcb_main.c -module_la_LIBADD = @EINA_LIBS@ @XCB_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_software_xcb_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -32,11 +31,4 @@ include_HEADERS = Evas_Engine_Software_Xcb.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_outbuf.c \ -evas_xcb_buffer.c \ -evas_xcb_color.c \ -evas_xcb_main.c \ -Evas_Engine_Software_Xcb.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/xrender_x11/Makefile.am b/src/modules/engines/xrender_x11/Makefile.am index 4300ca7..a8c175a 100644 --- a/src/modules/engines/xrender_x11/Makefile.am +++ b/src/modules/engines/xrender_x11/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@x_cflags@ +@evas_engine_xrender_x11_cflags@ if BUILD_ENGINE_XRENDER_X11 @@ -17,7 +17,6 @@ pkgdir = $(libdir)/evas/modules/engines/xrender_x11/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_engine_ximage.c \ evas_engine_xrender.c \ @@ -25,7 +24,7 @@ evas_engine_image.c \ evas_engine_font.c \ evas_engine_gradient.c -module_la_LIBADD = @EINA_LIBS@ @x_libs@ -lXrender $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_xrender_x11_libs@ module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -33,12 +32,4 @@ include_HEADERS = Evas_Engine_XRender_X11.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_engine_ximage.c \ -evas_engine_xrender.c \ -evas_engine_image.c \ -evas_engine_font.c \ -evas_engine_gradient.c \ -Evas_Engine_XRender_X11.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/engines/xrender_xcb/Makefile.am b/src/modules/engines/xrender_xcb/Makefile.am index ba2616c..951cf89 100644 --- a/src/modules/engines/xrender_xcb/Makefile.am +++ b/src/modules/engines/xrender_xcb/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ -@XCBRENDER_CFLAGS@ +@evas_engine_xrender_xcb_cflags@ if BUILD_ENGINE_XRENDER_XCB @@ -17,7 +17,6 @@ pkgdir = $(libdir)/evas/modules/engines/xrender_xcb/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_engine_ximage.c \ evas_engine_xrender.c \ @@ -25,7 +24,7 @@ evas_engine_image.c \ evas_engine_font.c \ evas_engine_gradient.c -module_la_LIBADD = @EINA_LIBS@ @XCBRENDER_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @evas_engine_xrender_xcb_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -33,12 +32,4 @@ include_HEADERS = Evas_Engine_XRender_Xcb.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_engine_ximage.c \ -evas_engine_xrender.c \ -evas_engine_image.c \ -evas_engine_font.c \ -evas_engine_gradient.c \ -Evas_Engine_XRender_Xcb.h +EXTRA_DIST = evas_engine.h diff --git a/src/modules/loaders/edb/Makefile.am b/src/modules/loaders/edb/Makefile.am index 75a8caa..44c9e7f 100644 --- a/src/modules/loaders/edb/Makefile.am +++ b/src/modules/loaders/edb/Makefile.am @@ -16,5 +16,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_edb.c module_la_LIBADD = @evas_image_loader_edb_libs@ @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LDFLAGS = -no-undefined -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/eet/Makefile.am b/src/modules/loaders/eet/Makefile.am index 175f136..4204e80 100644 --- a/src/modules/loaders/eet/Makefile.am +++ b/src/modules/loaders/eet/Makefile.am @@ -18,5 +18,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_eet.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_eet_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/gif/Makefile.am b/src/modules/loaders/gif/Makefile.am index 4dc75bc..858ac3f 100644 --- a/src/modules/loaders/gif/Makefile.am +++ b/src/modules/loaders/gif/Makefile.am @@ -18,5 +18,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_gif.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_gif_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/jpeg/Makefile.am b/src/modules/loaders/jpeg/Makefile.am index d410af4..4e7f71b 100644 --- a/src/modules/loaders/jpeg/Makefile.am +++ b/src/modules/loaders/jpeg/Makefile.am @@ -20,5 +20,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_jpeg.c module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_jpeg_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/pmaps/Makefile.am b/src/modules/loaders/pmaps/Makefile.am index eeca821..794ec9e 100644 --- a/src/modules/loaders/pmaps/Makefile.am +++ b/src/modules/loaders/pmaps/Makefile.am @@ -20,5 +20,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_pmaps.c module_la_LIBADD = @evas_image_loader_pmaps_libs@ @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/png/Makefile.am b/src/modules/loaders/png/Makefile.am index 0aeddc6..ccf52e3 100644 --- a/src/modules/loaders/png/Makefile.am +++ b/src/modules/loaders/png/Makefile.am @@ -18,5 +18,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_png.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_png_libs@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/svg/Makefile.am b/src/modules/loaders/svg/Makefile.am index 6e5f9ee..38c0273 100644 --- a/src/modules/loaders/svg/Makefile.am +++ b/src/modules/loaders/svg/Makefile.am @@ -18,5 +18,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_svg.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_svg_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/tiff/Makefile.am b/src/modules/loaders/tiff/Makefile.am index 7da47b5..b949871 100644 --- a/src/modules/loaders/tiff/Makefile.am +++ b/src/modules/loaders/tiff/Makefile.am @@ -20,5 +20,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_tiff.c module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_tiff_cflags@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/xpm/Makefile.am b/src/modules/loaders/xpm/Makefile.am index 8b45306..93505a0 100644 --- a/src/modules/loaders/xpm/Makefile.am +++ b/src/modules/loaders/xpm/Makefile.am @@ -20,5 +20,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_xpm.c module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_xpm_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/savers/edb/Makefile.am b/src/modules/savers/edb/Makefile.am index c3dff5d..ffe1ffb 100644 --- a/src/modules/savers/edb/Makefile.am +++ b/src/modules/savers/edb/Makefile.am @@ -14,7 +14,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_edb.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_edb_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LDFLAGS = -no-undefined -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static EXTRA_DIST = evas_image_save_edb.c diff --git a/src/modules/savers/eet/Makefile.am b/src/modules/savers/eet/Makefile.am index 58e9601..3f6ee4a 100644 --- a/src/modules/savers/eet/Makefile.am +++ b/src/modules/savers/eet/Makefile.am @@ -18,5 +18,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_eet.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_eet_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/savers/jpeg/Makefile.am b/src/modules/savers/jpeg/Makefile.am index 952813d..5900f1d 100644 --- a/src/modules/savers/jpeg/Makefile.am +++ b/src/modules/savers/jpeg/Makefile.am @@ -18,5 +18,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_jpeg.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_jpeg_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/savers/png/Makefile.am b/src/modules/savers/png/Makefile.am index 227b1c8..b8c14c7 100644 --- a/src/modules/savers/png/Makefile.am +++ b/src/modules/savers/png/Makefile.am @@ -20,5 +20,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_png.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_png_libs@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/savers/tiff/Makefile.am b/src/modules/savers/tiff/Makefile.am index d528cfc..3a871e9 100644 --- a/src/modules/savers/tiff/Makefile.am +++ b/src/modules/savers/tiff/Makefile.am @@ -18,5 +18,5 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_tiff.c module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_tiff_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static