From 6a08ea58e1a87d802629a518c41ddf2fe4dd50cb Mon Sep 17 00:00:00 2001 From: caro Date: Sat, 1 Nov 2008 09:46:51 +0000 Subject: [PATCH] * remove module_la_DEPENDENCIES useless variable * add -fno-rtti and -fno-exceptions when c++ is used (in Windows engines) * fix glew engine compilation * minor formatting git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@37369 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/engines/buffer/Makefile.am | 1 - src/modules/engines/cairo_common/Makefile.am | 21 +++++++++++---------- src/modules/engines/cairo_x11/Makefile.am | 11 +++++++++-- src/modules/engines/direct3d/Makefile.am | 2 +- src/modules/engines/directfb/Makefile.am | 1 - src/modules/engines/gl_common/Makefile.am | 2 -- src/modules/engines/gl_common/evas_gl_common.h | 8 ++++---- src/modules/engines/gl_glew/Makefile.am | 1 - src/modules/engines/gl_x11/Makefile.am | 1 - src/modules/engines/glitz_x11/Makefile.am | 1 - src/modules/engines/quartz/Makefile.am | 1 - src/modules/engines/software_16/Makefile.am | 1 - src/modules/engines/software_16_ddraw/Makefile.am | 2 +- src/modules/engines/software_16_sdl/Makefile.am | 1 - src/modules/engines/software_16_wince/Makefile.am | 2 +- src/modules/engines/software_16_x11/Makefile.am | 1 - src/modules/engines/software_ddraw/Makefile.am | 2 +- src/modules/engines/software_generic/Makefile.am | 1 - src/modules/engines/software_qtopia/Makefile.am | 1 - src/modules/engines/software_sdl/Makefile.am | 1 - src/modules/engines/software_x11/Makefile.am | 1 - src/modules/engines/software_xcb/Makefile.am | 1 - src/modules/engines/xrender_x11/Makefile.am | 1 - src/modules/engines/xrender_xcb/Makefile.am | 1 - src/modules/loaders/edb/Makefile.am | 1 - src/modules/loaders/eet/Makefile.am | 1 - src/modules/loaders/gif/Makefile.am | 1 - src/modules/loaders/jpeg/Makefile.am | 1 - src/modules/loaders/pmaps/Makefile.am | 2 -- src/modules/loaders/png/Makefile.am | 1 - src/modules/loaders/svg/Makefile.am | 1 - src/modules/loaders/tiff/Makefile.am | 1 - src/modules/loaders/xpm/Makefile.am | 1 - src/modules/savers/edb/Makefile.am | 1 - src/modules/savers/eet/Makefile.am | 1 - src/modules/savers/jpeg/Makefile.am | 1 - src/modules/savers/png/Makefile.am | 1 - src/modules/savers/tiff/Makefile.am | 1 - 38 files changed, 28 insertions(+), 53 deletions(-) diff --git a/src/modules/engines/buffer/Makefile.am b/src/modules/engines/buffer/Makefile.am index 11b2def..cd10b68 100644 --- a/src/modules/engines/buffer/Makefile.am +++ b/src/modules/engines/buffer/Makefile.am @@ -24,7 +24,6 @@ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h 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 ccb2330..5c4a7cc 100644 --- a/src/modules/engines/cairo_common/Makefile.am +++ b/src/modules/engines/cairo_common/Makefile.am @@ -1,22 +1,23 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @CAIRO_CFLAGS@ @EINA_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@CAIRO_CFLAGS@ \ +@EINA_CFLAGS@ if BUILD_ENGINE_CAIRO_COMMON -noinst_LTLIBRARIES = libevas_engine_cairo_common.la -libevas_engine_cairo_common_la_SOURCES = \ +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 - -libevas_engine_cairo_common_la_DEPENDENCIES = \ -$(top_builddir)/config.h +libevas_engine_cairo_common_la_LIBADD = @EINA_LIBS@ @CAIRO_LIBS@ $(top_builddir)/src/lib/libevas.la endif diff --git a/src/modules/engines/cairo_x11/Makefile.am b/src/modules/engines/cairo_x11/Makefile.am index 17ef589..dc39e22 100644 --- a/src/modules/engines/cairo_x11/Makefile.am +++ b/src/modules/engines/cairo_x11/Makefile.am @@ -1,7 +1,15 @@ 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@ @EINA_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 @@ -17,7 +25,6 @@ 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_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_Cairo_X11.h diff --git a/src/modules/engines/direct3d/Makefile.am b/src/modules/engines/direct3d/Makefile.am index 921c340..e81842e 100644 --- a/src/modules/engines/direct3d/Makefile.am +++ b/src/modules/engines/direct3d/Makefile.am @@ -21,10 +21,10 @@ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_Direct3D.h diff --git a/src/modules/engines/directfb/Makefile.am b/src/modules/engines/directfb/Makefile.am index a371d44..fed6b50 100644 --- a/src/modules/engines/directfb/Makefile.am +++ b/src/modules/engines/directfb/Makefile.am @@ -23,7 +23,6 @@ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_DirectFB.h diff --git a/src/modules/engines/gl_common/Makefile.am b/src/modules/engines/gl_common/Makefile.am index 9b93ad7..9f6e9ff 100644 --- a/src/modules/engines/gl_common/Makefile.am +++ b/src/modules/engines/gl_common/Makefile.am @@ -26,8 +26,6 @@ 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_DEPENDENCIES = $(top_builddir)/config.h - endif EXTRA_DIST = \ diff --git a/src/modules/engines/gl_common/evas_gl_common.h b/src/modules/engines/gl_common/evas_gl_common.h index 8c6ea9f..3b1018a 100644 --- a/src/modules/engines/gl_common/evas_gl_common.h +++ b/src/modules/engines/gl_common/evas_gl_common.h @@ -20,6 +20,10 @@ #include #include +#ifdef BUILD_ENGINE_GL_GLEW +#include +#endif /* BUILD_ENGINE_GL_GLEW */ + #ifdef BUILD_ENGINE_GL_QUARTZ #include #include @@ -28,10 +32,6 @@ #include #endif /* BUILD_ENGINE_GL_QUARTZ */ -#ifdef BUILD_ENGINE_GL_GLEW -#include -#endif /* BUILD_ENGINE_GL_GLEW */ - typedef struct _Evas_GL_Context Evas_GL_Context; typedef struct _Evas_GL_Texture Evas_GL_Texture; typedef struct _Evas_GL_Image Evas_GL_Image; diff --git a/src/modules/engines/gl_glew/Makefile.am b/src/modules/engines/gl_glew/Makefile.am index 9b57763..2999a0f 100644 --- a/src/modules/engines/gl_glew/Makefile.am +++ b/src/modules/engines/gl_glew/Makefile.am @@ -23,7 +23,6 @@ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_GL_Glew.h diff --git a/src/modules/engines/gl_x11/Makefile.am b/src/modules/engines/gl_x11/Makefile.am index 5ee371a..480df4e 100644 --- a/src/modules/engines/gl_x11/Makefile.am +++ b/src/modules/engines/gl_x11/Makefile.am @@ -25,7 +25,6 @@ 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_LDFLAGS = -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_GL_X11.h diff --git a/src/modules/engines/glitz_x11/Makefile.am b/src/modules/engines/glitz_x11/Makefile.am index 5ecfad7..2fa3f68 100644 --- a/src/modules/engines/glitz_x11/Makefile.am +++ b/src/modules/engines/glitz_x11/Makefile.am @@ -28,7 +28,6 @@ evas_engine_gradient.c 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 include_HEADERS = Evas_Engine_Glitz_X11.h diff --git a/src/modules/engines/quartz/Makefile.am b/src/modules/engines/quartz/Makefile.am index 70969fb..6332911 100644 --- a/src/modules/engines/quartz/Makefile.am +++ b/src/modules/engines/quartz/Makefile.am @@ -16,7 +16,6 @@ evas_engine.c 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 include_HEADERS = Evas_Engine_Quartz.h diff --git a/src/modules/engines/software_16/Makefile.am b/src/modules/engines/software_16/Makefile.am index 6402fc4..5182ebd 100644 --- a/src/modules/engines/software_16/Makefile.am +++ b/src/modules/engines/software_16/Makefile.am @@ -22,6 +22,5 @@ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h endif diff --git a/src/modules/engines/software_16_ddraw/Makefile.am b/src/modules/engines/software_16_ddraw/Makefile.am index fe4c2a6..dac0867 100644 --- a/src/modules/engines/software_16_ddraw/Makefile.am +++ b/src/modules/engines/software_16_ddraw/Makefile.am @@ -22,10 +22,10 @@ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_Software_16_DDraw.h diff --git a/src/modules/engines/software_16_sdl/Makefile.am b/src/modules/engines/software_16_sdl/Makefile.am index 7a872a0..8516815 100644 --- a/src/modules/engines/software_16_sdl/Makefile.am +++ b/src/modules/engines/software_16_sdl/Makefile.am @@ -16,7 +16,6 @@ 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_DEPENDENCIES = $(top_builddir)/config.h 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 65a4d30..48b2dab 100644 --- a/src/modules/engines/software_16_wince/Makefile.am +++ b/src/modules/engines/software_16_wince/Makefile.am @@ -28,10 +28,10 @@ evas_wince_ddraw_buffer.cpp \ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_Software_16_WinCE.h diff --git a/src/modules/engines/software_16_x11/Makefile.am b/src/modules/engines/software_16_x11/Makefile.am index 6826983..4ceaca6 100644 --- a/src/modules/engines/software_16_x11/Makefile.am +++ b/src/modules/engines/software_16_x11/Makefile.am @@ -25,7 +25,6 @@ evas_x_buffer.c 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 include_HEADERS = Evas_Engine_Software_16_X11.h diff --git a/src/modules/engines/software_ddraw/Makefile.am b/src/modules/engines/software_ddraw/Makefile.am index 6e654cf..14d477a 100644 --- a/src/modules/engines/software_ddraw/Makefile.am +++ b/src/modules/engines/software_ddraw/Makefile.am @@ -21,10 +21,10 @@ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_Software_DDraw.h diff --git a/src/modules/engines/software_generic/Makefile.am b/src/modules/engines/software_generic/Makefile.am index 237bfc1..a9de4e9 100644 --- a/src/modules/engines/software_generic/Makefile.am +++ b/src/modules/engines/software_generic/Makefile.am @@ -20,4 +20,3 @@ 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_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 3167c8a..f723b5a 100644 --- a/src/modules/engines/software_qtopia/Makefile.am +++ b/src/modules/engines/software_qtopia/Makefile.am @@ -26,7 +26,6 @@ evas_qt_main.cpp 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 include_HEADERS = Evas_Engine_Software_Qtopia.h diff --git a/src/modules/engines/software_sdl/Makefile.am b/src/modules/engines/software_sdl/Makefile.am index a08bbcd..27c87ca 100644 --- a/src/modules/engines/software_sdl/Makefile.am +++ b/src/modules/engines/software_sdl/Makefile.am @@ -23,7 +23,6 @@ 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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h include_HEADERS = Evas_Engine_SDL.h diff --git a/src/modules/engines/software_x11/Makefile.am b/src/modules/engines/software_x11/Makefile.am index 40a0f6d..f9b08b1 100644 --- a/src/modules/engines/software_x11/Makefile.am +++ b/src/modules/engines/software_x11/Makefile.am @@ -27,7 +27,6 @@ evas_x_main.c 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 include_HEADERS = Evas_Engine_Software_X11.h diff --git a/src/modules/engines/software_xcb/Makefile.am b/src/modules/engines/software_xcb/Makefile.am index 68204c2..c9ad478 100644 --- a/src/modules/engines/software_xcb/Makefile.am +++ b/src/modules/engines/software_xcb/Makefile.am @@ -27,7 +27,6 @@ evas_xcb_main.c 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 include_HEADERS = Evas_Engine_Software_Xcb.h diff --git a/src/modules/engines/xrender_x11/Makefile.am b/src/modules/engines/xrender_x11/Makefile.am index 62959ec..4300ca7 100644 --- a/src/modules/engines/xrender_x11/Makefile.am +++ b/src/modules/engines/xrender_x11/Makefile.am @@ -28,7 +28,6 @@ evas_engine_gradient.c 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 include_HEADERS = Evas_Engine_XRender_X11.h diff --git a/src/modules/engines/xrender_xcb/Makefile.am b/src/modules/engines/xrender_xcb/Makefile.am index 89ee022..ba2616c 100644 --- a/src/modules/engines/xrender_xcb/Makefile.am +++ b/src/modules/engines/xrender_xcb/Makefile.am @@ -28,7 +28,6 @@ evas_engine_gradient.c 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 include_HEADERS = Evas_Engine_XRender_Xcb.h diff --git a/src/modules/loaders/edb/Makefile.am b/src/modules/loaders/edb/Makefile.am index 226098a..953755b 100644 --- a/src/modules/loaders/edb/Makefile.am +++ b/src/modules/loaders/edb/Makefile.am @@ -16,6 +16,5 @@ module_la_SOURCES = evas_image_load_edb.c 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 EXTRA_DIST = evas_image_load_edb.c diff --git a/src/modules/loaders/eet/Makefile.am b/src/modules/loaders/eet/Makefile.am index 766e0a6..afda140 100644 --- a/src/modules/loaders/eet/Makefile.am +++ b/src/modules/loaders/eet/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_eet.c 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 c6fb476..f15a20c 100644 --- a/src/modules/loaders/gif/Makefile.am +++ b/src/modules/loaders/gif/Makefile.am @@ -19,4 +19,3 @@ module_la_SOURCES = evas_image_load_gif.c 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 f30f2fd..09087b2 100644 --- a/src/modules/loaders/jpeg/Makefile.am +++ b/src/modules/loaders/jpeg/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_jpeg.c 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 c8ea7ec..98cf3ca 100644 --- a/src/modules/loaders/pmaps/Makefile.am +++ b/src/modules/loaders/pmaps/Makefile.am @@ -19,6 +19,4 @@ module_la_SOURCES = evas_image_load_pmaps.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_LIBTOOLFLAGS = --tag=disable-static -module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/modules/loaders/png/Makefile.am b/src/modules/loaders/png/Makefile.am index 451abad..72e8bd6 100644 --- a/src/modules/loaders/png/Makefile.am +++ b/src/modules/loaders/png/Makefile.am @@ -18,4 +18,3 @@ module_la_SOURCES = evas_image_load_png.c 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 bbbd179..e8f5935 100644 --- a/src/modules/loaders/svg/Makefile.am +++ b/src/modules/loaders/svg/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_svg.c 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 71b4153..66e6981 100644 --- a/src/modules/loaders/tiff/Makefile.am +++ b/src/modules/loaders/tiff/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_tiff.c 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 1f0815f..5079aa4 100644 --- a/src/modules/loaders/xpm/Makefile.am +++ b/src/modules/loaders/xpm/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_xpm.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_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 05d6009..06da4ca 100644 --- a/src/modules/savers/edb/Makefile.am +++ b/src/modules/savers/edb/Makefile.am @@ -16,6 +16,5 @@ module_la_SOURCES = evas_image_save_edb.c 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 EXTRA_DIST = evas_image_save_edb.c diff --git a/src/modules/savers/eet/Makefile.am b/src/modules/savers/eet/Makefile.am index fd1d88c..acbaa0c 100644 --- a/src/modules/savers/eet/Makefile.am +++ b/src/modules/savers/eet/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_save_eet.c 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 c034fab..0b56644 100644 --- a/src/modules/savers/jpeg/Makefile.am +++ b/src/modules/savers/jpeg/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_save_jpeg.c 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 f385f58..40aa2b8 100644 --- a/src/modules/savers/png/Makefile.am +++ b/src/modules/savers/png/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_save_png.c 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 7a2b7e8..a3bd860 100644 --- a/src/modules/savers/tiff/Makefile.am +++ b/src/modules/savers/tiff/Makefile.am @@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_save_tiff.c 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