From 19dfd83e244c0f937c3455b77028436988f0f2b7 Mon Sep 17 00:00:00 2001 From: devilhorns Date: Fri, 9 Jul 2010 06:10:55 +0000 Subject: [PATCH] Move Evas (and associated headers) to their own dir (ie: the 'eet.h' move). git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@50141 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 2 ++ evas.pc.in | 2 +- src/lib/Makefile.am | 3 ++- src/modules/engines/buffer/Makefile.am | 3 ++- src/modules/engines/cairo_x11/Makefile.am | 3 ++- src/modules/engines/direct3d/Makefile.am | 3 ++- src/modules/engines/directfb/Makefile.am | 3 ++- src/modules/engines/fb/Makefile.am | 3 ++- src/modules/engines/gl_glew/Makefile.am | 3 ++- src/modules/engines/gl_sdl/Makefile.am | 3 ++- src/modules/engines/gl_x11/Makefile.am | 3 ++- src/modules/engines/quartz/Makefile.am | 3 ++- src/modules/engines/software_16_ddraw/Makefile.am | 3 ++- src/modules/engines/software_16_sdl/Makefile.am | 3 ++- src/modules/engines/software_16_wince/Makefile.am | 3 ++- src/modules/engines/software_16_x11/Makefile.am | 3 ++- src/modules/engines/software_ddraw/Makefile.am | 3 ++- src/modules/engines/software_gdi/Makefile.am | 3 ++- src/modules/engines/software_qtopia/Makefile.am | 3 ++- src/modules/engines/software_sdl/Makefile.am | 3 ++- src/modules/engines/software_x11/Makefile.am | 3 ++- src/modules/engines/xrender_x11/Makefile.am | 3 ++- 22 files changed, 43 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index c4cf192..f76c784 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,8 @@ AC_SUBST(version_info) AC_SUBST(release_info) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +VMAJ=v_maj +AC_SUBST(VMAJ) EFL_CHECK_PATH_MAX diff --git a/evas.pc.in b/evas.pc.in index f443bae..70755ed 100644 --- a/evas.pc.in +++ b/evas.pc.in @@ -9,4 +9,4 @@ Description: Evas canvas display library Version: @VERSION@ Libs: -L${libdir} -levas Libs.private: @EFL_FNMATCH_LIBS@ @pthread_libs@ -Cflags: -I${includedir} +Cflags: -I${includedir}/evas-@VMAJ@ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index d357f4e..d80c8b8 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -176,7 +176,8 @@ AM_CFLAGS = @WIN32_CFLAGS@ lib_LTLIBRARIES = libevas.la -include_HEADERS = Evas.h +includes_HEADERS = Evas.h +includesdir = $(includedir)/evas-@VMAJ@ libevas_la_SOURCES = main.c diff --git a/src/modules/engines/buffer/Makefile.am b/src/modules/engines/buffer/Makefile.am index 371eabd..45d92cd 100644 --- a/src/modules/engines/buffer/Makefile.am +++ b/src/modules/engines/buffer/Makefile.am @@ -19,7 +19,8 @@ evas_outbuf.c pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Buffer.h +includes_HEADERS = Evas_Engine_Buffer.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_BUFFER diff --git a/src/modules/engines/cairo_x11/Makefile.am b/src/modules/engines/cairo_x11/Makefile.am index e861db2..33153ff 100644 --- a/src/modules/engines/cairo_x11/Makefile.am +++ b/src/modules/engines/cairo_x11/Makefile.am @@ -20,7 +20,8 @@ CAIRO_X11_LIBADD = @evas_engine_cairo_x11_libs@ $(top_builddir)/src/modules/engi pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Cairo_X11.h +includes_HEADERS = Evas_Engine_Cairo_X11.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_CAIRO_X11 diff --git a/src/modules/engines/direct3d/Makefile.am b/src/modules/engines/direct3d/Makefile.am index 6b1412d..5847494 100644 --- a/src/modules/engines/direct3d/Makefile.am +++ b/src/modules/engines/direct3d/Makefile.am @@ -31,7 +31,8 @@ DIRECT3D_LIBADD = @evas_engine_direct3d_libs@ pkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Direct3D.h +includes_HEADERS = Evas_Engine_Direct3D.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_DIRECT3D diff --git a/src/modules/engines/directfb/Makefile.am b/src/modules/engines/directfb/Makefile.am index c4b7a5e..ff571b5 100644 --- a/src/modules/engines/directfb/Makefile.am +++ b/src/modules/engines/directfb/Makefile.am @@ -19,7 +19,8 @@ DIRECTFB_LIBADD = @evas_engine_directfb_libs@ pkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_DirectFB.h +includes_HEADERS = Evas_Engine_DirectFB.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_DIRECTFB diff --git a/src/modules/engines/fb/Makefile.am b/src/modules/engines/fb/Makefile.am index 6779773..58c70ca 100644 --- a/src/modules/engines/fb/Makefile.am +++ b/src/modules/engines/fb/Makefile.am @@ -21,7 +21,8 @@ FB_LIBADD = @evas_engine_fb_libs@ pkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_FB.h +includes_HEADERS = Evas_Engine_FB.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_FB diff --git a/src/modules/engines/gl_glew/Makefile.am b/src/modules/engines/gl_glew/Makefile.am index 938429a..2042b4a 100644 --- a/src/modules/engines/gl_glew/Makefile.am +++ b/src/modules/engines/gl_glew/Makefile.am @@ -20,7 +20,8 @@ GL_GLEW_LIBADD = @evas_engine_gl_glew_libs@ $(top_builddir)/src/modules/engines/ pkgdir = $(libdir)/evas/modules/engines/gl_glew/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_GL_Glew.h +includes_HEADERS = Evas_Engine_GL_Glew.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_GL_GLEW diff --git a/src/modules/engines/gl_sdl/Makefile.am b/src/modules/engines/gl_sdl/Makefile.am index b275538..4af0ed5 100644 --- a/src/modules/engines/gl_sdl/Makefile.am +++ b/src/modules/engines/gl_sdl/Makefile.am @@ -19,7 +19,8 @@ GL_SDL_LIBADD = @evas_engine_gl_sdl_libs@ $(top_builddir)/src/modules/engines/gl pkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_GL_SDL.h +includes_HEADERS = Evas_Engine_GL_SDL.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_GL_SDL diff --git a/src/modules/engines/gl_x11/Makefile.am b/src/modules/engines/gl_x11/Makefile.am index 7421af2..de391da 100644 --- a/src/modules/engines/gl_x11/Makefile.am +++ b/src/modules/engines/gl_x11/Makefile.am @@ -20,7 +20,8 @@ GL_X11_LIBADD = @evas_engine_gl_x11_libs@ $(top_builddir)/src/modules/engines/gl pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_GL_X11.h +includes_HEADERS = Evas_Engine_GL_X11.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_GL_X11 diff --git a/src/modules/engines/quartz/Makefile.am b/src/modules/engines/quartz/Makefile.am index 597e454..df92e17 100644 --- a/src/modules/engines/quartz/Makefile.am +++ b/src/modules/engines/quartz/Makefile.am @@ -16,7 +16,8 @@ QUARTZ_LIBADD = @evas_engine_quartz_libs@ pkgdir = $(libdir)/evas/modules/engines/quartz/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Quartz.h +includes_HEADERS = Evas_Engine_Quartz.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_QUARTZ diff --git a/src/modules/engines/software_16_ddraw/Makefile.am b/src/modules/engines/software_16_ddraw/Makefile.am index 321227c..c075691 100644 --- a/src/modules/engines/software_16_ddraw/Makefile.am +++ b/src/modules/engines/software_16_ddraw/Makefile.am @@ -22,7 +22,8 @@ SOFTWARE_16_DDRAW_LIBADD = @evas_engine_software_16_ddraw_libs@ pkgdir = $(libdir)/evas/modules/engines/software_16_ddraw/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Software_16_DDraw.h +includes_HEADERS = Evas_Engine_Software_16_DDraw.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW diff --git a/src/modules/engines/software_16_sdl/Makefile.am b/src/modules/engines/software_16_sdl/Makefile.am index 75ee709..bcaa15b 100644 --- a/src/modules/engines/software_16_sdl/Makefile.am +++ b/src/modules/engines/software_16_sdl/Makefile.am @@ -12,7 +12,8 @@ evas_engine.h pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_SDL_16.h +includes_HEADERS = Evas_Engine_SDL_16.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_SDL diff --git a/src/modules/engines/software_16_wince/Makefile.am b/src/modules/engines/software_16_wince/Makefile.am index 8c7d780..984b418 100644 --- a/src/modules/engines/software_16_wince/Makefile.am +++ b/src/modules/engines/software_16_wince/Makefile.am @@ -24,7 +24,8 @@ SOFTWARE_16_WINCE_LIBADD = @evas_engine_software_16_wince_libs@ pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Software_16_WinCE.h +includes_HEADERS = Evas_Engine_Software_16_WinCE.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_16_WINCE diff --git a/src/modules/engines/software_16_x11/Makefile.am b/src/modules/engines/software_16_x11/Makefile.am index 45106ed..979f315 100644 --- a/src/modules/engines/software_16_x11/Makefile.am +++ b/src/modules/engines/software_16_x11/Makefile.am @@ -21,7 +21,8 @@ SOFTWARE_16_X11_LIBADD = @evas_engine_software_16_x11_libs@ pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Software_16_X11.h +includes_HEADERS = Evas_Engine_Software_16_X11.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_16_X11 diff --git a/src/modules/engines/software_ddraw/Makefile.am b/src/modules/engines/software_ddraw/Makefile.am index 5a3a266..440e291 100644 --- a/src/modules/engines/software_ddraw/Makefile.am +++ b/src/modules/engines/software_ddraw/Makefile.am @@ -22,7 +22,8 @@ SOFTWARE_DDRAW_LIBADD = @evas_engine_software_ddraw_libs@ pkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Software_DDraw.h +includes_HEADERS = Evas_Engine_Software_DDraw.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_DDRAW diff --git a/src/modules/engines/software_gdi/Makefile.am b/src/modules/engines/software_gdi/Makefile.am index 35c4bc8..dfebabe 100644 --- a/src/modules/engines/software_gdi/Makefile.am +++ b/src/modules/engines/software_gdi/Makefile.am @@ -22,7 +22,8 @@ SOFTWARE_GDI_LIBADD = @evas_engine_software_gdi_libs@ pkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Software_Gdi.h +includes_HEADERS = Evas_Engine_Software_Gdi.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_GDI diff --git a/src/modules/engines/software_qtopia/Makefile.am b/src/modules/engines/software_qtopia/Makefile.am index a8ac900..a4202a9 100644 --- a/src/modules/engines/software_qtopia/Makefile.am +++ b/src/modules/engines/software_qtopia/Makefile.am @@ -23,7 +23,8 @@ SOFTWARE_QTOPIA_LIBADD = @evas_engine_software_qtopia_libs@ pkgdir = $(libdir)/evas/modules/engines/software_qtopia/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Software_Qtopia.h +includes_HEADERS = Evas_Engine_Software_Qtopia.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_QTOPIA diff --git a/src/modules/engines/software_sdl/Makefile.am b/src/modules/engines/software_sdl/Makefile.am index 8f075c3..4e3e386 100644 --- a/src/modules/engines/software_sdl/Makefile.am +++ b/src/modules/engines/software_sdl/Makefile.am @@ -19,7 +19,8 @@ SOFTWARE_SDL_LIBADD = @evas_engine_software_sdl_libs@ pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_SDL.h +includes_HEADERS = Evas_Engine_SDL.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_SDL diff --git a/src/modules/engines/software_x11/Makefile.am b/src/modules/engines/software_x11/Makefile.am index 8d7ae13..7e20f2d 100644 --- a/src/modules/engines/software_x11/Makefile.am +++ b/src/modules/engines/software_x11/Makefile.am @@ -39,7 +39,8 @@ endif pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_Software_X11.h +includes_HEADERS = Evas_Engine_Software_X11.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_SOFTWARE_X11 diff --git a/src/modules/engines/xrender_x11/Makefile.am b/src/modules/engines/xrender_x11/Makefile.am index 83d1a77..54ba3c0 100644 --- a/src/modules/engines/xrender_x11/Makefile.am +++ b/src/modules/engines/xrender_x11/Makefile.am @@ -36,7 +36,8 @@ XRENDER_X11_LIBADD = @evas_engine_xrender_xcb_libs@ @evas_engine_xrender_x11_lib pkgdir = $(libdir)/evas/modules/engines/xrender_x11/$(MODULE_ARCH) -include_HEADERS = Evas_Engine_XRender_X11.h +includes_HEADERS = Evas_Engine_XRender_X11.h +includesdir = $(includedir)/evas-@VMAJ@ if !EVAS_STATIC_BUILD_XRENDER_X11 -- 2.7.4