From 56eacad43d77f2d6f3f5b560b69e43679c18b3b1 Mon Sep 17 00:00:00 2001 From: doursse Date: Wed, 23 Apr 2008 06:55:10 +0000 Subject: [PATCH] Autotools cleaning (not complete) * formatting * put WIN32_CFLAGS in AM_CFLAGS and not AM_CPPFLAGS, as it is where it belongs * rename create_shared_lib to lt_no_undefined * pass -Wl,--enable-auto-import to libtool when compiling with cegcc * add files to EXTRA_DIST only when they are not in _SOURCES or _include_HEADERS (they are added anyway) SVN revision: 34353 --- legacy/evas/configure.in | 9 ++- legacy/evas/src/lib/Makefile.am | 80 +++++++++---------- .../src/lib/engines/common_16/Makefile.am | 31 +++---- legacy/evas/src/lib/file/Makefile.am | 19 +++-- .../src/modules/engines/buffer/Makefile.am | 15 ++-- .../src/modules/engines/direct3d/Makefile.am | 2 +- .../src/modules/engines/gl_glew/Makefile.am | 2 +- .../modules/engines/software_16/Makefile.am | 10 +-- .../engines/software_16_ddraw/Makefile.am | 2 +- .../engines/software_16_sdl/Makefile.am | 2 +- .../engines/software_ddraw/Makefile.am | 2 +- .../engines/software_generic/Makefile.am | 11 +-- .../modules/engines/software_sdl/Makefile.am | 16 ++-- .../evas/src/modules/loaders/edb/Makefile.am | 2 +- .../evas/src/modules/loaders/eet/Makefile.am | 25 +++--- .../evas/src/modules/loaders/gif/Makefile.am | 23 +++--- .../evas/src/modules/loaders/jpeg/Makefile.am | 25 +++--- .../src/modules/loaders/pmaps/Makefile.am | 25 +++--- .../evas/src/modules/loaders/png/Makefile.am | 23 +++--- .../evas/src/modules/loaders/svg/Makefile.am | 24 +++--- .../evas/src/modules/loaders/tiff/Makefile.am | 24 +++--- .../evas/src/modules/loaders/xpm/Makefile.am | 25 +++--- .../evas/src/modules/savers/edb/Makefile.am | 2 +- .../evas/src/modules/savers/eet/Makefile.am | 25 +++--- .../evas/src/modules/savers/jpeg/Makefile.am | 25 +++--- .../evas/src/modules/savers/png/Makefile.am | 25 +++--- .../evas/src/modules/savers/tiff/Makefile.am | 24 +++--- 27 files changed, 252 insertions(+), 246 deletions(-) diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index 93dc58d120..6c0d27cda0 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -38,7 +38,8 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") PKG_PROG_PKG_CONFIG WIN32_CFLAGS="" -create_shared_lib="" +lt_no_undefined="" +lt_enable_auto_import="" case "$host_os" in mingw|mingw32*|cegcc) PKG_CHECK_MODULES(EVIL, evil) @@ -47,12 +48,14 @@ case "$host_os" in AC_DEFINE(EFL_EVAS_BUILD, 1, [Define to mention that evas is built]) if test "$host_os" = "cegcc" ; then WIN32_CFLAGS="-mwin32" + lt_enable_auto_import="-Wl,--enable-auto-import" fi - create_shared_lib="-no-undefined " + lt_no_undefined="-no-undefined " ;; esac AC_SUBST(WIN32_CFLAGS) -AC_SUBST(create_shared_lib) +AC_SUBST(lt_no_undefined) +AC_SUBST(lt_enable_auto_import) x_dir="" x_cflags="" diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am index ed6dd8cd1e..b3741d7878 100644 --- a/legacy/evas/src/lib/Makefile.am +++ b/legacy/evas/src/lib/Makefile.am @@ -3,51 +3,51 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = canvas data cache file engines imaging include -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - -DPACKAGE_BIN_DIR=\"$(bindir)\" \ - -DPACKAGE_LIB_DIR=\"$(libdir)\" \ - -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ - @FREETYPE_CFLAGS@ \ - @EET_CFLAGS@ \ - @FONTCONFIG_CFLAGS@ \ - @WIN32_CFLAGS@ \ - @pthread_cflags@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +@FREETYPE_CFLAGS@ \ +@EET_CFLAGS@ \ +@FONTCONFIG_CFLAGS@ \ +@pthread_cflags@ -lib_LTLIBRARIES = libevas.la +AM_CFLAGS = @WIN32_CFLAGS@ -include_HEADERS = \ -Evas.h +lib_LTLIBRARIES = libevas.la -libevas_la_SOURCES = \ -main.c +include_HEADERS = Evas.h -libevas_la_LIBADD = \ - canvas/libevas_canvas.la \ - data/libevas_data.la \ - file/libevas_file.la \ - cache/libevas_cache.la \ - imaging/libevas_imaging.la \ - engines/common/libevas_engine_common.la \ - engines/common_16/libevas_engine_common_16.la \ - -lm \ - @fnmatch_libs@ \ - @dlopen_libs@ \ - @FREETYPE_LIBS@ \ - @EET_LIBS@ \ - @FONTCONFIG_LIBS@ \ - @pthread_libs@ +libevas_la_SOURCES = main.c + +libevas_la_LIBADD = \ +canvas/libevas_canvas.la \ +data/libevas_data.la \ +file/libevas_file.la \ +cache/libevas_cache.la \ +imaging/libevas_imaging.la \ +engines/common/libevas_engine_common.la \ +engines/common_16/libevas_engine_common_16.la \ +-lm \ +@fnmatch_libs@ \ +@dlopen_libs@ \ +@FREETYPE_LIBS@ \ +@EET_LIBS@ \ +@FONTCONFIG_LIBS@ \ +@pthread_libs@ libevas_la_DEPENDENCIES = \ - $(top_builddir)/config.h \ - canvas/libevas_canvas.la \ - data/libevas_data.la \ - file/libevas_file.la \ - cache/libevas_cache.la \ - imaging/libevas_imaging.la \ - engines/common/libevas_engine_common.la \ - engines/common_16/libevas_engine_common_16.la +$(top_builddir)/config.h \ +canvas/libevas_canvas.la \ +data/libevas_data.la \ +file/libevas_file.la \ +cache/libevas_cache.la \ +imaging/libevas_imaging.la \ +engines/common/libevas_engine_common.la \ +engines/common_16/libevas_engine_common_16.la -libevas_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@ +libevas_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ diff --git a/legacy/evas/src/lib/engines/common_16/Makefile.am b/legacy/evas/src/lib/engines/common_16/Makefile.am index 4bf5047db0..84321dbb89 100644 --- a/legacy/evas/src/lib/engines/common_16/Makefile.am +++ b/legacy/evas/src/lib/engines/common_16/Makefile.am @@ -1,13 +1,17 @@ -AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ - @EET_CFLAGS@ @pthread_cflags@ -noinst_LTLIBRARIES = libevas_engine_common_16.la +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@VALGRIND_CFLAGS@ \ +@EET_CFLAGS@ \ +@pthread_cflags@ + +noinst_LTLIBRARIES = libevas_engine_common_16.la + libevas_engine_common_16_la_SOURCES = \ evas_soft16_dither_mask.c \ evas_soft16_font.c \ @@ -18,17 +22,8 @@ evas_soft16_rectangle.c \ evas_soft16_line.c \ evas_soft16_polygon.c -libevas_engine_common_16_la_DEPENDENCIES = \ -$(top_builddir)/config.h +libevas_engine_common_16_la_DEPENDENCIES = $(top_builddir)/config.h EXTRA_DIST = \ -evas_soft16_dither_mask.c \ -evas_soft16_font.c \ -evas_soft16_image_scaled_sampled.c \ -evas_soft16_image_unscaled.c \ -evas_soft16_main.c \ -evas_soft16_rectangle.c \ -evas_soft16_line.c \ evas_soft16_scanline_blend.c \ -evas_soft16_scanline_fill.c \ -evas_soft16_polygon.c +evas_soft16_scanline_fill.c diff --git a/legacy/evas/src/lib/file/Makefile.am b/legacy/evas/src/lib/file/Makefile.am index f56d9f75a2..1556304118 100644 --- a/legacy/evas/src/lib/file/Makefile.am +++ b/legacy/evas/src/lib/file/Makefile.am @@ -1,14 +1,17 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - -DPACKAGE_BIN_DIR=\"$(bindir)\" \ - -DPACKAGE_LIB_DIR=\"$(libdir)\" \ - -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ - @FREETYPE_CFLAGS@ \ - @EVIL_CFLAGS@ @WIN32_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +@FREETYPE_CFLAGS@ \ +@EVIL_CFLAGS@ + +AM_CFLAGS = @WIN32_CFLAGS@ noinst_LTLIBRARIES = libevas_file.la libevas_file_la_SOURCES = \ diff --git a/legacy/evas/src/modules/engines/buffer/Makefile.am b/legacy/evas/src/modules/engines/buffer/Makefile.am index fb24599b83..34a25b5469 100644 --- a/legacy/evas/src/modules/engines/buffer/Makefile.am +++ b/legacy/evas/src/modules/engines/buffer/Makefile.am @@ -6,21 +6,22 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ -@FREETYPE_CFLAGS@ \ -@WIN32_CFLAGS@ +@FREETYPE_CFLAGS@ + +AM_CFLAGS = @WIN32_CFLAGS@ if BUILD_ENGINE_BUFFER pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la + module_la_SOURCES = \ -evas_engine.h \ evas_engine.c \ evas_outbuf.c module_la_LIBADD = $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +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 @@ -28,8 +29,4 @@ include_HEADERS = Evas_Engine_Buffer.h endif -EXTRA_DIST = \ -evas_engine.h \ -evas_engine.c \ -evas_outbuf.c \ -Evas_Engine_Buffer.h +EXTRA_DIST = evas_engine.h diff --git a/legacy/evas/src/modules/engines/direct3d/Makefile.am b/legacy/evas/src/modules/engines/direct3d/Makefile.am index 0f8fd5c6c6..b3c14e7903 100644 --- a/legacy/evas/src/modules/engines/direct3d/Makefile.am +++ b/legacy/evas/src/modules/engines/direct3d/Makefile.am @@ -21,7 +21,7 @@ evas_direct3d_buffer.c \ evas_direct3d_main.cpp module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @direct3d_libs@ -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +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/legacy/evas/src/modules/engines/gl_glew/Makefile.am b/legacy/evas/src/modules/engines/gl_glew/Makefile.am index 00eddd7a8e..aad714f2fb 100644 --- a/legacy/evas/src/modules/engines/gl_glew/Makefile.am +++ b/legacy/evas/src/modules/engines/gl_glew/Makefile.am @@ -20,7 +20,7 @@ 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 = @create_shared_lib@ -module -avoid-version +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/legacy/evas/src/modules/engines/software_16/Makefile.am b/legacy/evas/src/modules/engines/software_16/Makefile.am index cdaba8dc2e..63ad485f51 100644 --- a/legacy/evas/src/modules/engines/software_16/Makefile.am +++ b/legacy/evas/src/modules/engines/software_16/Makefile.am @@ -6,8 +6,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ -@FREETYPE_CFLAGS@ \ -@WIN32_CFLAGS@ +@FREETYPE_CFLAGS@ + +AM_CFLAGS = @WIN32_CFLAGS@ if BUILD_ENGINE_SOFTWARE_16 @@ -18,11 +19,8 @@ module_la_SOURCES = \ evas_engine.c module_la_LIBADD = $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +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 - -EXTRA_DIST = \ -evas_engine.c diff --git a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am index 8ff3c248f9..9c1fb4f72c 100644 --- a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am +++ b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am @@ -22,7 +22,7 @@ evas_ddraw_buffer.cpp \ evas_ddraw_main.cpp module_la_LIBADD = @ddraw_16_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +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/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am index ab1603d423..679d599f09 100644 --- a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am +++ b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am @@ -15,7 +15,7 @@ evas_engine.c \ evas_engine.h module_la_LIBADD = @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs +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/legacy/evas/src/modules/engines/software_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am index 11a94143b9..aa817b7732 100644 --- a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am +++ b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am @@ -21,7 +21,7 @@ evas_ddraw_buffer.c \ evas_ddraw_main.cpp module_la_LIBADD = @ddraw_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +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/legacy/evas/src/modules/engines/software_generic/Makefile.am b/legacy/evas/src/modules/engines/software_generic/Makefile.am index 5bac1c04be..5e1e0fa3f2 100644 --- a/legacy/evas/src/modules/engines/software_generic/Makefile.am +++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am @@ -6,16 +6,17 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ -@FREETYPE_CFLAGS@ \ -@WIN32_CFLAGS@ +@FREETYPE_CFLAGS@ + +AM_CFLAGS = @WIN32_CFLAGS@ pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la -module_la_SOURCES = \ -evas_engine.c + +module_la_SOURCES = evas_engine.c module_la_LIBADD = $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +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/legacy/evas/src/modules/engines/software_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_sdl/Makefile.am index 2de71844c8..4c4c1236cc 100644 --- a/legacy/evas/src/modules/engines/software_sdl/Makefile.am +++ b/legacy/evas/src/modules/engines/software_sdl/Makefile.am @@ -7,8 +7,9 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/include \ -I$(top_srcdir)/src/modules/engines \ @FREETYPE_CFLAGS@ \ -@SDL_CFLAGS@ \ -@WIN32_CFLAGS@ +@SDL_CFLAGS@ + +AM_CFLAGS = @WIN32_CFLAGS@ if BUILD_ENGINE_SDL @@ -16,12 +17,10 @@ pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la -module_la_SOURCES = \ -evas_engine.c \ -evas_engine.h +module_la_SOURCES = evas_engine.c module_la_LIBADD = @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h @@ -29,7 +28,4 @@ include_HEADERS = Evas_Engine_SDL.h endif -EXTRA_DIST = \ -evas_engine.c \ -evas_engine.h \ -Evas_Engine_SDL.h +EXTRA_DIST = evas_engine.h diff --git a/legacy/evas/src/modules/loaders/edb/Makefile.am b/legacy/evas/src/modules/loaders/edb/Makefile.am index 6c8c2bad3d..81f29c4f8d 100644 --- a/legacy/evas/src/modules/loaders/edb/Makefile.am +++ b/legacy/evas/src/modules/loaders/edb/Makefile.am @@ -13,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_LDFLAGS = @create_shared_lib@ -module -avoid-version +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/legacy/evas/src/modules/loaders/eet/Makefile.am b/legacy/evas/src/modules/loaders/eet/Makefile.am index b59fb93186..4f186ce273 100644 --- a/legacy/evas/src/modules/loaders/eet/Makefile.am +++ b/legacy/evas/src/modules/loaders/eet/Makefile.am @@ -1,21 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @EET_CFLAGS@ \ - @WIN32_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@EET_CFLAGS@ -pkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH) -module_la_SOURCES = evas_image_load_eet.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @EET_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_load_eet.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_load_eet.c diff --git a/legacy/evas/src/modules/loaders/gif/Makefile.am b/legacy/evas/src/modules/loaders/gif/Makefile.am index d783c5f469..f28fc27711 100644 --- a/legacy/evas/src/modules/loaders/gif/Makefile.am +++ b/legacy/evas/src/modules/loaders/gif/Makefile.am @@ -1,20 +1,21 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @gif_cflags@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ @gif_cflags@ -pkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH) -module_la_SOURCES = evas_image_load_gif.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @gif_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_load_gif.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_load_gif.c diff --git a/legacy/evas/src/modules/loaders/jpeg/Makefile.am b/legacy/evas/src/modules/loaders/jpeg/Makefile.am index 7524e4dae1..c8cb9f68b5 100644 --- a/legacy/evas/src/modules/loaders/jpeg/Makefile.am +++ b/legacy/evas/src/modules/loaders/jpeg/Makefile.am @@ -1,21 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @jpeg_cflags@ \ - @WIN32_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@jpeg_cflags@ -pkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH) -module_la_SOURCES = evas_image_load_jpeg.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @jpeg_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_load_jpeg.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_load_jpeg.c diff --git a/legacy/evas/src/modules/loaders/pmaps/Makefile.am b/legacy/evas/src/modules/loaders/pmaps/Makefile.am index 3e2b6cd752..0a0748dc91 100644 --- a/legacy/evas/src/modules/loaders/pmaps/Makefile.am +++ b/legacy/evas/src/modules/loaders/pmaps/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@ @pmaps_cflags@ \ - @WIN32_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@pmaps_cflags@ -pkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH) -module_la_SOURCES = evas_image_load_pmaps.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_load_pmaps.c + +module_la_LIBADD = $(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 - -EXTRA_DIST = evas_image_load_pmaps.c diff --git a/legacy/evas/src/modules/loaders/png/Makefile.am b/legacy/evas/src/modules/loaders/png/Makefile.am index db8d707a1a..6e00dcfc6d 100644 --- a/legacy/evas/src/modules/loaders/png/Makefile.am +++ b/legacy/evas/src/modules/loaders/png/Makefile.am @@ -1,21 +1,20 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @PNG_CFLAGS@ \ - @WIN32_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@PNG_CFLAGS@ -pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) +pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la +pkg_LTLIBRARIES = module.la -module_la_SOURCES = evas_image_load_png.c +module_la_SOURCES = evas_image_load_png.c -module_la_LIBADD = @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_load_png.c diff --git a/legacy/evas/src/modules/loaders/svg/Makefile.am b/legacy/evas/src/modules/loaders/svg/Makefile.am index fae82370ec..235c15b22c 100644 --- a/legacy/evas/src/modules/loaders/svg/Makefile.am +++ b/legacy/evas/src/modules/loaders/svg/Makefile.am @@ -1,20 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @svg_cflags@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@svg_cflags@ -pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH) -module_la_SOURCES = evas_image_load_svg.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @svg_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_load_svg.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_load_svg.c diff --git a/legacy/evas/src/modules/loaders/tiff/Makefile.am b/legacy/evas/src/modules/loaders/tiff/Makefile.am index 1a5255c737..6306aedc91 100644 --- a/legacy/evas/src/modules/loaders/tiff/Makefile.am +++ b/legacy/evas/src/modules/loaders/tiff/Makefile.am @@ -1,20 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @tiff_cflags@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@tiff_cflags@ -pkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH) -module_la_SOURCES = evas_image_load_tiff.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @tiff_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_load_tiff.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_load_tiff.c diff --git a/legacy/evas/src/modules/loaders/xpm/Makefile.am b/legacy/evas/src/modules/loaders/xpm/Makefile.am index bcdc6df659..3698983a2b 100644 --- a/legacy/evas/src/modules/loaders/xpm/Makefile.am +++ b/legacy/evas/src/modules/loaders/xpm/Makefile.am @@ -1,21 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @xpm_cflags@ \ - @WIN32_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@xpm_cflags@ -pkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH) -module_la_SOURCES = evas_image_load_xpm.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_load_xpm.c + +module_la_LIBADD = $(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 - -EXTRA_DIST = evas_image_load_xpm.c diff --git a/legacy/evas/src/modules/savers/edb/Makefile.am b/legacy/evas/src/modules/savers/edb/Makefile.am index 13034ac549..f3a6509619 100644 --- a/legacy/evas/src/modules/savers/edb/Makefile.am +++ b/legacy/evas/src/modules/savers/edb/Makefile.am @@ -13,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_LDFLAGS = @create_shared_lib@ -module -avoid-version +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/legacy/evas/src/modules/savers/eet/Makefile.am b/legacy/evas/src/modules/savers/eet/Makefile.am index 4edfee0170..f7cf97fd61 100644 --- a/legacy/evas/src/modules/savers/eet/Makefile.am +++ b/legacy/evas/src/modules/savers/eet/Makefile.am @@ -1,21 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @EET_CFLAGS@ \ - @WIN32_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@EET_CFLAGS@ -pkgdir = $(libdir)/evas/modules/savers/eet/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/savers/eet/$(MODULE_ARCH) -module_la_SOURCES = evas_image_save_eet.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @EET_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_save_eet.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_save_eet.c diff --git a/legacy/evas/src/modules/savers/jpeg/Makefile.am b/legacy/evas/src/modules/savers/jpeg/Makefile.am index d750aaee66..640c1f72da 100644 --- a/legacy/evas/src/modules/savers/jpeg/Makefile.am +++ b/legacy/evas/src/modules/savers/jpeg/Makefile.am @@ -1,21 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @jpeg_cflags@ \ - @WIN32_CFLAGS@ +AM_CPPFLAGS= \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@jpeg_cflags@ -pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) -module_la_SOURCES = evas_image_save_jpeg.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @jpeg_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_save_jpeg.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_save_jpeg.c diff --git a/legacy/evas/src/modules/savers/png/Makefile.am b/legacy/evas/src/modules/savers/png/Makefile.am index a9f67390e5..c8b4790c5a 100644 --- a/legacy/evas/src/modules/savers/png/Makefile.am +++ b/legacy/evas/src/modules/savers/png/Makefile.am @@ -1,21 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @PNG_CFLAGS@ \ - @WIN32_CFLAGS@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@PNG_CFLAGS@ -pkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) -module_la_SOURCES = evas_image_save_png.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_save_png.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_save_png.c diff --git a/legacy/evas/src/modules/savers/tiff/Makefile.am b/legacy/evas/src/modules/savers/tiff/Makefile.am index c7abf47ab6..776d736507 100644 --- a/legacy/evas/src/modules/savers/tiff/Makefile.am +++ b/legacy/evas/src/modules/savers/tiff/Makefile.am @@ -1,20 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -AM_CPPFLAGS = -I. \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/include \ - @FREETYPE_CFLAGS@ @tiff_cflags@ +AM_CPPFLAGS = \ +-I. \ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/include \ +@FREETYPE_CFLAGS@ \ +@tiff_cflags@ -pkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) +AM_CFLAGS = @WIN32_CFLAGS@ -pkg_LTLIBRARIES = module.la +pkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) -module_la_SOURCES = evas_image_save_tiff.c +pkg_LTLIBRARIES = module.la -module_la_LIBADD = @tiff_libs@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version +module_la_SOURCES = evas_image_save_tiff.c + +module_la_LIBADD = @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 - -EXTRA_DIST = evas_image_save_tiff.c