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

@@ -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=""

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@
 

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

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  = \

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

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
 

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
 

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

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
 

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

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
 

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

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

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
 

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

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

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

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

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

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

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

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

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
 

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

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

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

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