From dde6f387fb074d17d92b1c969cdd83a65e39e1a9 Mon Sep 17 00:00:00 2001 From: cedric Date: Mon, 13 Oct 2008 15:58:56 +0000 Subject: [PATCH] Make evas depend on eina. No change in the code yet, so just fix your build system and no bug must show up. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@36621 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 3 +++ src/lib/Makefile.am | 2 ++ src/lib/cache/Makefile.am | 3 ++- src/lib/canvas/Makefile.am | 2 +- src/lib/data/Makefile.am | 2 +- src/lib/engines/common/Makefile.am | 2 +- src/lib/engines/common_16/Makefile.am | 1 + src/lib/file/Makefile.am | 1 + src/lib/imaging/Makefile.am | 3 ++- src/modules/engines/buffer/Makefile.am | 3 ++- src/modules/engines/cairo_common/Makefile.am | 4 ++-- src/modules/engines/cairo_x11/Makefile.am | 4 ++-- src/modules/engines/direct3d/Makefile.am | 3 ++- src/modules/engines/directfb/Makefile.am | 3 ++- src/modules/engines/fb/Makefile.am | 5 +++-- src/modules/engines/gl_common/Makefile.am | 3 ++- src/modules/engines/gl_glew/Makefile.am | 1 + src/modules/engines/gl_x11/Makefile.am | 3 ++- src/modules/engines/glitz_x11/Makefile.am | 3 ++- src/modules/engines/quartz/Makefile.am | 4 ++-- src/modules/engines/software_16/Makefile.am | 5 +++-- src/modules/engines/software_16_ddraw/Makefile.am | 3 ++- src/modules/engines/software_16_sdl/Makefile.am | 4 ++-- 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_generic/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/software_xcb/Makefile.am | 3 ++- src/modules/engines/xrender_x11/Makefile.am | 3 ++- src/modules/engines/xrender_xcb/Makefile.am | 3 ++- src/modules/loaders/edb/Makefile.am | 5 +++-- src/modules/loaders/eet/Makefile.am | 5 +++-- src/modules/loaders/gif/Makefile.am | 5 +++-- src/modules/loaders/jpeg/Makefile.am | 3 ++- src/modules/loaders/pmaps/Makefile.am | 3 ++- src/modules/loaders/png/Makefile.am | 3 ++- src/modules/loaders/svg/Makefile.am | 3 ++- src/modules/loaders/tiff/Makefile.am | 3 ++- src/modules/loaders/xpm/Makefile.am | 3 ++- src/modules/savers/edb/Makefile.am | 5 +++-- src/modules/savers/eet/Makefile.am | 3 ++- src/modules/savers/jpeg/Makefile.am | 3 ++- src/modules/savers/png/Makefile.am | 3 ++- src/modules/savers/tiff/Makefile.am | 3 ++- 47 files changed, 95 insertions(+), 52 deletions(-) diff --git a/configure.ac b/configure.ac index 312ab3d..5b0fe3d 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,9 @@ AC_ARG_ENABLE(strict, [use_strict="no"] ) +##################################################################### +# Check evas strong dependencie +PKG_CHECK_MODULES([EINA], [eina-0]) ##################################################################### diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 8ead2e4..bd2ae3f 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +@EINA_CFLAGS@ \ @FREETYPE_CFLAGS@ \ @EET_CFLAGS@ \ @FONTCONFIG_CFLAGS@ \ @@ -36,6 +37,7 @@ engines/common/libevas_engine_common.la \ @EET_LIBS@ \ @FONTCONFIG_LIBS@ \ @pthread_libs@ \ +@EINA_LIBS@ \ -lm libevas_la_DEPENDENCIES = \ diff --git a/src/lib/cache/Makefile.am b/src/lib/cache/Makefile.am index 30b7943..7fc895e 100644 --- a/src/lib/cache/Makefile.am +++ b/src/lib/cache/Makefile.am @@ -7,7 +7,8 @@ AM_CPPFLAGS = -I. \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ - @FREETYPE_CFLAGS@ + @FREETYPE_CFLAGS@ \ + @EINA_CFLAGS@ noinst_LTLIBRARIES = libevas_cache.la libevas_cache_la_SOURCES = \ diff --git a/src/lib/canvas/Makefile.am b/src/lib/canvas/Makefile.am index b85c4d2..f751952 100644 --- a/src/lib/canvas/Makefile.am +++ b/src/lib/canvas/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -I. \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @FREETYPE_CFLAGS@ @EET_CFLAGS@ \ - @FONTCONFIG_CFLAGS@ + @FONTCONFIG_CFLAGS@ @EINA_CFLAGS@ noinst_LTLIBRARIES = libevas_canvas.la libevas_canvas_la_SOURCES = \ diff --git a/src/lib/data/Makefile.am b/src/lib/data/Makefile.am index 6d3ef57..4f7db23 100644 --- a/src/lib/data/Makefile.am +++ b/src/lib/data/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = -I. \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ - @FREETYPE_CFLAGS@ + @FREETYPE_CFLAGS@ @EINA_CFLAGS@ noinst_LTLIBRARIES = libevas_data.la libevas_data_la_SOURCES = \ diff --git a/src/lib/engines/common/Makefile.am b/src/lib/engines/common/Makefile.am index 643bc42..b76c667 100644 --- a/src/lib/engines/common/Makefile.am +++ b/src/lib/engines/common/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = -I. \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ @EET_CFLAGS@ @pthread_cflags@ \ - @WIN32_CFLAGS@ + @WIN32_CFLAGS@ @EINA_CFLAGS@ noinst_LTLIBRARIES = libevas_engine_common.la libevas_engine_common_la_SOURCES = \ diff --git a/src/lib/engines/common_16/Makefile.am b/src/lib/engines/common_16/Makefile.am index 84321db..00268d5 100644 --- a/src/lib/engines/common_16/Makefile.am +++ b/src/lib/engines/common_16/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ @VALGRIND_CFLAGS@ \ +@EINA_CFLAGS@ \ @EET_CFLAGS@ \ @pthread_cflags@ diff --git a/src/lib/file/Makefile.am b/src/lib/file/Makefile.am index 686dd83..7084755 100644 --- a/src/lib/file/Makefile.am +++ b/src/lib/file/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @EVIL_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ diff --git a/src/lib/imaging/Makefile.am b/src/lib/imaging/Makefile.am index cd6528d..e6efc95 100644 --- a/src/lib/imaging/Makefile.am +++ b/src/lib/imaging/Makefile.am @@ -8,7 +8,8 @@ AM_CPPFLAGS = -I. \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @FREETYPE_CFLAGS@ \ - @EET_CFLAGS@ + @EET_CFLAGS@ \ + @EINA_CFLAGS@ noinst_LTLIBRARIES = libevas_imaging.la libevas_imaging_la_SOURCES = \ diff --git a/src/modules/engines/buffer/Makefile.am b/src/modules/engines/buffer/Makefile.am index 34a25b5..11b2def 100644 --- a/src/modules/engines/buffer/Makefile.am +++ b/src/modules/engines/buffer/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ +@EINA_CFLAGS@ \ @FREETYPE_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -20,7 +21,7 @@ module_la_SOURCES = \ evas_engine.c \ evas_outbuf.c -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la +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_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/cairo_common/Makefile.am b/src/modules/engines/cairo_common/Makefile.am index ce0d0cb..ccb2330 100644 --- a/src/modules/engines/cairo_common/Makefile.am +++ b/src/modules/engines/cairo_common/Makefile.am @@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @CAIRO_CFLAGS@ + @FREETYPE_CFLAGS@ @CAIRO_CFLAGS@ @EINA_CFLAGS@ if BUILD_ENGINE_CAIRO_COMMON @@ -14,7 +14,7 @@ evas_cairo_private.h \ evas_cairo_common.h \ evas_cairo_main.c -libevas_engine_cairo_common_la_LIBADD = @CAIRO_LIBS@ $(top_builddir)/src/lib/libevas.la +libevas_engine_cairo_common_la_LIBADD = @EINA_LIBS@ @CAIRO_LIBS@ $(top_builddir)/src/lib/libevas.la libevas_engine_cairo_common_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/src/modules/engines/cairo_x11/Makefile.am b/src/modules/engines/cairo_x11/Makefile.am index aea46d7..17ef589 100644 --- a/src/modules/engines/cairo_x11/Makefile.am +++ b/src/modules/engines/cairo_x11/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines/cairo_common @FREETYPE_CFLAGS@ @x_cflags@ @CAIRO_CFLAGS@ +AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines/cairo_common @FREETYPE_CFLAGS@ @x_cflags@ @CAIRO_CFLAGS@ @EINA_CFLAGS@ if BUILD_ENGINE_CAIRO_X11 @@ -14,7 +14,7 @@ evas_engine.h \ evas_engine.c \ evas_x_main.c -module_la_LIBADD = @CAIRO_LIBS@ @x_libs@ $(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la $(top_builddir)/src/lib/libevas.la +module_la_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_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/direct3d/Makefile.am b/src/modules/engines/direct3d/Makefile.am index b3c14e7..921c340 100644 --- a/src/modules/engines/direct3d/Makefile.am +++ b/src/modules/engines/direct3d/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ +@EINA_CFLAGS@ \ @FREETYPE_CFLAGS@ if BUILD_ENGINE_DIRECT3D @@ -20,7 +21,7 @@ evas_outbuf.c \ evas_direct3d_buffer.c \ evas_direct3d_main.cpp -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @direct3d_libs@ +module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la @direct3d_libs@ module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/directfb/Makefile.am b/src/modules/engines/directfb/Makefile.am index 1353401..a371d44 100644 --- a/src/modules/engines/directfb/Makefile.am +++ b/src/modules/engines/directfb/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @DIRECTFB_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -19,7 +20,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_engine.c polygon.c -module_la_LIBADD = @DIRECTFB_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @DIRECTFB_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/fb/Makefile.am b/src/modules/engines/fb/Makefile.am index 0b0ac04..f8c858e 100644 --- a/src/modules/engines/fb/Makefile.am +++ b/src/modules/engines/fb/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ -@FREETYPE_CFLAGS@ +@FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ if BUILD_ENGINE_FB @@ -20,7 +21,7 @@ evas_engine.c \ evas_fb_main.c \ evas_outbuf.c -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_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 diff --git a/src/modules/engines/gl_common/Makefile.am b/src/modules/engines/gl_common/Makefile.am index 172403f..9b93ad7 100644 --- a/src/modules/engines/gl_common/Makefile.am +++ b/src/modules/engines/gl_common/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @gl_cflags@ if BUILD_ENGINE_GL_COMMON @@ -24,7 +25,7 @@ evas_gl_polygon.c \ evas_gl_rectangle.c \ evas_gl_texture.c -libevas_engine_gl_common_la_LIBADD = @gl_libs@ $(top_builddir)/src/lib/libevas.la +libevas_engine_gl_common_la_LIBADD = @EINA_LIBS@ @gl_libs@ $(top_builddir)/src/lib/libevas.la libevas_engine_gl_common_la_DEPENDENCIES = $(top_builddir)/config.h endif diff --git a/src/modules/engines/gl_glew/Makefile.am b/src/modules/engines/gl_glew/Makefile.am index aad714f..9b57763 100644 --- a/src/modules/engines/gl_glew/Makefile.am +++ b/src/modules/engines/gl_glew/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines/gl_common \ +@EINA_CFLAGS@ \ @FREETYPE_CFLAGS@ if BUILD_ENGINE_GL_GLEW diff --git a/src/modules/engines/gl_x11/Makefile.am b/src/modules/engines/gl_x11/Makefile.am index c058220..5ee371a 100644 --- a/src/modules/engines/gl_x11/Makefile.am +++ b/src/modules/engines/gl_x11/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines/gl_common \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @x_cflags@ \ @gl_cflags@ @@ -21,7 +22,7 @@ evas_engine.h \ evas_engine.c \ evas_x_main.c -module_la_LIBADD = @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@ @gl_libs@ @x_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 module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/glitz_x11/Makefile.am b/src/modules/engines/glitz_x11/Makefile.am index c3ffa61..5ecfad7 100644 --- a/src/modules/engines/glitz_x11/Makefile.am +++ b/src/modules/engines/glitz_x11/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @x_cflags@ \ @GLITZ_CFLAGS@ @@ -24,7 +25,7 @@ evas_engine_image.c \ evas_engine_font.c \ evas_engine_gradient.c -module_la_LIBADD = @x_libs@ @GLITZ_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @x_libs@ @GLITZ_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 diff --git a/src/modules/engines/quartz/Makefile.am b/src/modules/engines/quartz/Makefile.am index 24ba355..70969fb 100644 --- a/src/modules/engines/quartz/Makefile.am +++ b/src/modules/engines/quartz/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @quartz_cflags@ @FREETYPE_CFLAGS@ +AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @quartz_cflags@ @FREETYPE_CFLAGS@ @EINA_CFLAGS@ if BUILD_ENGINE_QUARTZ @@ -13,7 +13,7 @@ module_la_SOURCES = \ evas_engine.h \ evas_engine.c -module_la_LIBADD = @quartz_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @quartz_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 diff --git a/src/modules/engines/software_16/Makefile.am b/src/modules/engines/software_16/Makefile.am index 63ad485..6402fc4 100644 --- a/src/modules/engines/software_16/Makefile.am +++ b/src/modules/engines/software_16/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ -@FREETYPE_CFLAGS@ +@FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -18,7 +19,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = \ evas_engine.c -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la +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_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/software_16_ddraw/Makefile.am b/src/modules/engines/software_16_ddraw/Makefile.am index 9c1fb4f..fe4c2a6 100644 --- a/src/modules/engines/software_16_ddraw/Makefile.am +++ b/src/modules/engines/software_16_ddraw/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ -I$(top_srcdir)/src/modules/engines/software_16 \ +@EINA_CFLAGS@ \ @FREETYPE_CFLAGS@ if BUILD_ENGINE_SOFTWARE_16_DDRAW @@ -21,7 +22,7 @@ evas_engine.c \ evas_ddraw_buffer.cpp \ evas_ddraw_main.cpp -module_la_LIBADD = @ddraw_16_libs@ $(top_builddir)/src/lib/libevas.la +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_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/software_16_sdl/Makefile.am b/src/modules/engines/software_16_sdl/Makefile.am index 679d599..7a872a0 100644 --- a/src/modules/engines/software_16_sdl/Makefile.am +++ b/src/modules/engines/software_16_sdl/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @SDL_CFLAGS@ +INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ if BUILD_ENGINE_SDL @@ -14,7 +14,7 @@ module_la_SOURCES = \ evas_engine.c \ evas_engine.h -module_la_LIBADD = @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la +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_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/software_16_wince/Makefile.am b/src/modules/engines/software_16_wince/Makefile.am index d02e9af..31240a1 100644 --- a/src/modules/engines/software_16_wince/Makefile.am +++ b/src/modules/engines/software_16_wince/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ -I$(top_srcdir)/src/modules/engines/software_16 \ +@EINA_CFLAGS@ \ @FREETYPE_CFLAGS@ .rc.lo: @@ -27,7 +28,7 @@ evas_wince_ddraw_buffer.cpp \ evas_wince_gapi.rc module_la_CFLAGS = @WIN32_CFLAGS@ -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/software_16_x11/Makefile.am b/src/modules/engines/software_16_x11/Makefile.am index 628e459..6826983 100644 --- a/src/modules/engines/software_16_x11/Makefile.am +++ b/src/modules/engines/software_16_x11/Makefile.am @@ -8,6 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/modules/engines \ -I$(top_srcdir)/src/modules/engines/software_16 \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @x_cflags@ if BUILD_ENGINE_SOFTWARE_16_X11 @@ -21,7 +22,7 @@ evas_engine.h \ evas_engine.c \ evas_x_buffer.c -module_la_LIBADD = @x_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @x_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 diff --git a/src/modules/engines/software_ddraw/Makefile.am b/src/modules/engines/software_ddraw/Makefile.am index aa817b7..6e654cf 100644 --- a/src/modules/engines/software_ddraw/Makefile.am +++ b/src/modules/engines/software_ddraw/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ +@EINA_CFLAGS@ \ @FREETYPE_CFLAGS@ if BUILD_ENGINE_SOFTWARE_DDRAW @@ -20,7 +21,7 @@ evas_outbuf.c \ evas_ddraw_buffer.c \ evas_ddraw_main.cpp -module_la_LIBADD = @ddraw_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @ddraw_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/software_generic/Makefile.am b/src/modules/engines/software_generic/Makefile.am index 5e1e0fa..237bfc1 100644 --- a/src/modules/engines/software_generic/Makefile.am +++ b/src/modules/engines/software_generic/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ +@EINA_CFLAGS@ \ @FREETYPE_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_engine.c -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la +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_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/software_qtopia/Makefile.am b/src/modules/engines/software_qtopia/Makefile.am index 2911f2d..3167c8a 100644 --- a/src/modules/engines/software_qtopia/Makefile.am +++ b/src/modules/engines/software_qtopia/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @qt_cflags@ AM_CXXFLAGS = $(CFLAGS) -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -DNO_DEBUG @@ -22,7 +23,7 @@ evas_engine.c \ evas_outbuf.c \ evas_qt_main.cpp -module_la_LIBADD = @qt_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @qt_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 diff --git a/src/modules/engines/software_sdl/Makefile.am b/src/modules/engines/software_sdl/Makefile.am index 4c4c123..a08bbcd 100644 --- a/src/modules/engines/software_sdl/Makefile.am +++ b/src/modules/engines/software_sdl/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @SDL_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -19,7 +20,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_engine.c -module_la_LIBADD = @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/engines/software_x11/Makefile.am b/src/modules/engines/software_x11/Makefile.am index f6e96d8..40a0f6d 100644 --- a/src/modules/engines/software_x11/Makefile.am +++ b/src/modules/engines/software_x11/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @x_cflags@ if BUILD_ENGINE_SOFTWARE_X11 @@ -23,7 +24,7 @@ evas_x_buffer.c \ evas_x_color.c \ evas_x_main.c -module_la_LIBADD = @x_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @x_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 diff --git a/src/modules/engines/software_xcb/Makefile.am b/src/modules/engines/software_xcb/Makefile.am index 1b78bfa..68204c2 100644 --- a/src/modules/engines/software_xcb/Makefile.am +++ b/src/modules/engines/software_xcb/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @XCB_CFLAGS@ if BUILD_ENGINE_SOFTWARE_XCB @@ -23,7 +24,7 @@ evas_xcb_buffer.c \ evas_xcb_color.c \ evas_xcb_main.c -module_la_LIBADD = @XCB_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @XCB_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 diff --git a/src/modules/engines/xrender_x11/Makefile.am b/src/modules/engines/xrender_x11/Makefile.am index 1928a5c..62959ec 100644 --- a/src/modules/engines/xrender_x11/Makefile.am +++ b/src/modules/engines/xrender_x11/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @x_cflags@ if BUILD_ENGINE_XRENDER_X11 @@ -24,7 +25,7 @@ evas_engine_image.c \ evas_engine_font.c \ evas_engine_gradient.c -module_la_LIBADD = @x_libs@ -lXrender $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @x_libs@ -lXrender $(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 diff --git a/src/modules/engines/xrender_xcb/Makefile.am b/src/modules/engines/xrender_xcb/Makefile.am index 7650066..89ee022 100644 --- a/src/modules/engines/xrender_xcb/Makefile.am +++ b/src/modules/engines/xrender_xcb/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @XCBRENDER_CFLAGS@ if BUILD_ENGINE_XRENDER_XCB @@ -24,7 +25,7 @@ evas_engine_image.c \ evas_engine_font.c \ evas_engine_gradient.c -module_la_LIBADD = @XCBRENDER_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @XCBRENDER_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 diff --git a/src/modules/loaders/edb/Makefile.am b/src/modules/loaders/edb/Makefile.am index 81f29c4..226098a 100644 --- a/src/modules/loaders/edb/Makefile.am +++ b/src/modules/loaders/edb/Makefile.am @@ -4,7 +4,8 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @EDB_CFLAGS@ + @FREETYPE_CFLAGS@ @EDB_CFLAGS@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/evas/modules/loaders/edb/$(MODULE_ARCH) @@ -12,7 +13,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_edb.c -module_la_LIBADD = @EDB_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EDB_LIBS@ @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/loaders/eet/Makefile.am b/src/modules/loaders/eet/Makefile.am index 4f186ce..766e0a6 100644 --- a/src/modules/loaders/eet/Makefile.am +++ b/src/modules/loaders/eet/Makefile.am @@ -6,7 +6,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ -@EET_CFLAGS@ +@EET_CFLAGS@ \ +@EINA_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_eet.c -module_la_LIBADD = @EET_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @EET_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/loaders/gif/Makefile.am b/src/modules/loaders/gif/Makefile.am index f28fc27..c6fb476 100644 --- a/src/modules/loaders/gif/Makefile.am +++ b/src/modules/loaders/gif/Makefile.am @@ -5,7 +5,8 @@ AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -@FREETYPE_CFLAGS@ @gif_cflags@ +@FREETYPE_CFLAGS@ @gif_cflags@ \ +@EINA_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -15,7 +16,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_gif.c -module_la_LIBADD = @gif_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @gif_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/loaders/jpeg/Makefile.am b/src/modules/loaders/jpeg/Makefile.am index c8cb9f6..f30f2fd 100644 --- a/src/modules/loaders/jpeg/Makefile.am +++ b/src/modules/loaders/jpeg/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @jpeg_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_jpeg.c -module_la_LIBADD = @jpeg_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @jpeg_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/loaders/pmaps/Makefile.am b/src/modules/loaders/pmaps/Makefile.am index 0a0748d..c8ea7ec 100644 --- a/src/modules/loaders/pmaps/Makefile.am +++ b/src/modules/loaders/pmaps/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @pmaps_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_pmaps.c -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la +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_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/loaders/png/Makefile.am b/src/modules/loaders/png/Makefile.am index 6e00dcf..451abad 100644 --- a/src/modules/loaders/png/Makefile.am +++ b/src/modules/loaders/png/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @PNG_CFLAGS@ pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) @@ -14,7 +15,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_png.c -module_la_LIBADD = @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/loaders/svg/Makefile.am b/src/modules/loaders/svg/Makefile.am index 235c15b..bbbd179 100644 --- a/src/modules/loaders/svg/Makefile.am +++ b/src/modules/loaders/svg/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @svg_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_svg.c -module_la_LIBADD = @svg_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @svg_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/loaders/tiff/Makefile.am b/src/modules/loaders/tiff/Makefile.am index 6306aed..71b4153 100644 --- a/src/modules/loaders/tiff/Makefile.am +++ b/src/modules/loaders/tiff/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @tiff_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_tiff.c -module_la_LIBADD = @tiff_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @tiff_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/loaders/xpm/Makefile.am b/src/modules/loaders/xpm/Makefile.am index 3698983..1f0815f 100644 --- a/src/modules/loaders/xpm/Makefile.am +++ b/src/modules/loaders/xpm/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @xpm_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_xpm.c -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la +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_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/savers/edb/Makefile.am b/src/modules/savers/edb/Makefile.am index f3a6509..05d6009 100644 --- a/src/modules/savers/edb/Makefile.am +++ b/src/modules/savers/edb/Makefile.am @@ -4,7 +4,8 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @EDB_CFLAGS@ + @FREETYPE_CFLAGS@ @EDB_CFLAGS@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/evas/modules/savers/edb/$(MODULE_ARCH) @@ -12,7 +13,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_edb.c -module_la_LIBADD = @EDB_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @EDB_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/savers/eet/Makefile.am b/src/modules/savers/eet/Makefile.am index f7cf97f..fd1d88c 100644 --- a/src/modules/savers/eet/Makefile.am +++ b/src/modules/savers/eet/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @EET_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_eet.c -module_la_LIBADD = @EET_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @EET_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/savers/jpeg/Makefile.am b/src/modules/savers/jpeg/Makefile.am index 640c1f7..c034fab 100644 --- a/src/modules/savers/jpeg/Makefile.am +++ b/src/modules/savers/jpeg/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS= \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @jpeg_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_jpeg.c -module_la_LIBADD = @jpeg_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @jpeg_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/savers/png/Makefile.am b/src/modules/savers/png/Makefile.am index c8b4790..f385f58 100644 --- a/src/modules/savers/png/Makefile.am +++ b/src/modules/savers/png/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @PNG_CFLAGS@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_png.c -module_la_LIBADD = @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/savers/tiff/Makefile.am b/src/modules/savers/tiff/Makefile.am index 776d736..7a2b7e8 100644 --- a/src/modules/savers/tiff/Makefile.am +++ b/src/modules/savers/tiff/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ @FREETYPE_CFLAGS@ \ +@EINA_CFLAGS@ \ @tiff_cflags@ AM_CFLAGS = @WIN32_CFLAGS@ @@ -16,7 +17,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_save_tiff.c -module_la_LIBADD = @tiff_libs@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @tiff_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h -- 2.7.4