autostuff improvements:

* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE and check the required minimal versions. * add bzipped distribution archive * add AC_LIBTOOL_WIN32_DLL * forbid libtool to check fortran * compute libtool versioning from the version of the package * pass the directories based on ${prefix} to the preoprocessor with the -D option * replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS * remove useless -L flags in *_la_LDFLAGS SVN revision: 32337
2007-11-04 09:21:50 +00:00 · 2007-11-04 09:21:50 +00:00 · e21fb0f122
parent cc6001a0a0
commit e21fb0f122
44 changed files with 232 additions and 217 deletions
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@ -1,20 +1,34 @@
 # get rid of that stupid cache mechanism
 rm -f config.cache

-AC_INIT(configure.in)
+AC_INIT(evas, 0.9.9.041)
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
-AM_INIT_AUTOMAKE(evas, 0.9.9.041)
+
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
 AM_CONFIG_HEADER(config.h)

-AC_C_BIGENDIAN
+AC_PROG_CXX
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
+AC_C_BIGENDIAN
 AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+
+AC_LIBTOOL_WIN32_DLL
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
+
+VMAJ=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $1);}'`
+VMIN=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $2);}'`
+VMIC=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $3);}'`
+SNAP=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $4);}'`
+version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
+AC_SUBST(version_info)
+
 AC_FUNC_ALLOCA

 MODULE_ARCH="$host_os-$host_cpu"
@ -29,35 +43,6 @@ case "$host_os" in
 esac
 AC_SUBST(create_shared_lib)

-if test "x${bindir}" = 'xNONE'; then
-  if test "x${prefix}" = "xNONE"; then
-    PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
-  else
-    PACKAGE_BIN_DIR="${prefix}/bin"
-  fi
-else
-  PACKAGE_BIN_DIR="${bindir}"
-fi
-AC_SUBST(PACKAGE_BIN_DIR)
-
-if test "x${libdir}" = 'xNONE'; then
-  if test "x${prefix}" = "xNONE"; then
-    PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
-  else
-    PACKAGE_LIB_DIR="${prefix}/lib"
-  fi
-else
-  PACKAGE_LIB_DIR="${libdir}"
-fi
-AC_SUBST(PACKAGE_LIB_DIR)
-
-if test "x${prefix}" = "xNONE"; then
-  PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
-else
-  PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
-fi
-AC_SUBST(PACKAGE_DATA_DIR)
-
 x_dir=""
 x_cflags=""
 x_libs=""
@ -577,7 +562,7 @@ AC_ARG_ENABLE(software-qtopia, [  --enable-software-qtopia        enable the Sof
 	]
 )
 if test "x$have_evas_qtopia" = "xyes"; then
-  AC_PROG_CXX
+  AC_LANG_PUSH(C++)
  AC_CHECK_HEADER(qdirectpainter_qws.h,
    [
      AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_QTOPIA, test "$enableval" = "yes")
@ -597,6 +582,7 @@ if test "x$have_evas_qtopia" = "xyes"; then
      #include <qpainter.h>
    ]
  )
+  AC_LANG_POP(C++)
 else
  AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_QTOPIA, false)
 fi
--- a/legacy/evas/src/lib/Makefile.am
+++ b/legacy/evas/src/lib/Makefile.am
@ -1,12 +1,14 @@
+
 MAINTAINERCLEANFILES = Makefile.in

 SUBDIRS = canvas data cache file engines imaging include

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-INCLUDES	     = -I. \
+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@ \
@ -44,5 +46,5 @@ libevas_la_DEPENDENCIES = \
 			  imaging/libevas_imaging.la \
 			  engines/common/libevas_engine_common.la

-libevas_la_LDFLAGS      = @create_shared_lib@ -version-info 1:0:0
+libevas_la_LDFLAGS      = @create_shared_lib@ -version-info @version_info@

--- a/legacy/evas/src/lib/cache/Makefile.am
+++ b/legacy/evas/src/lib/cache/Makefile.am
@ -1,13 +1,12 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. \
+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@

 noinst_LTLIBRARIES      = libevas_cache.la
--- a/legacy/evas/src/lib/canvas/Makefile.am
+++ b/legacy/evas/src/lib/canvas/Makefile.am
@ -1,13 +1,12 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. \
+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@

--- a/legacy/evas/src/lib/data/Makefile.am
+++ b/legacy/evas/src/lib/data/Makefile.am
@ -1,13 +1,12 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. \
+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@

 noinst_LTLIBRARIES      = libevas_data.la
--- a/legacy/evas/src/lib/engines/Makefile.am
+++ b/legacy/evas/src/lib/engines/Makefile.am
@ -1,4 +1,5 @@
+
 MAINTAINERCLEANFILES = Makefile.in

 SUBDIRS = \
-common 
+common
--- a/legacy/evas/src/lib/engines/common/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/Makefile.am
@ -1,12 +1,14 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

-SUBDIRS = evas_op_add evas_op_blend evas_op_copy evas_op_mask evas_op_mul evas_op_sub 
+SUBDIRS = evas_op_add evas_op_blend evas_op_copy evas_op_mask evas_op_mul evas_op_sub

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. \
+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@ @VALGRIND_CFLAGS@ \
 		       @EET_CFLAGS@ @pthread_cflags@

--- a/legacy/evas/src/lib/file/Makefile.am
+++ b/legacy/evas/src/lib/file/Makefile.am
@ -1,17 +1,13 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. \
+AM_CPPFLAGS	     = -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
-		       @FREETYPE_CFLAGS@ \
-		       -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
-		       -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
-		       -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
+		       -DPACKAGE_BIN_DIR=\"$(bindir)\" \
+		       -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+		       -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+		       @FREETYPE_CFLAGS@

 noinst_LTLIBRARIES      = libevas_file.la
 libevas_file_la_SOURCES  = \
--- a/legacy/evas/src/lib/imaging/Makefile.am
+++ b/legacy/evas/src/lib/imaging/Makefile.am
@ -1,15 +1,14 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. \
+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@ 
+		       @EET_CFLAGS@

 noinst_LTLIBRARIES      = libevas_imaging.la
 libevas_imaging_la_SOURCES  = \
--- a/legacy/evas/src/lib/include/Makefile.am
+++ b/legacy/evas/src/lib/include/Makefile.am
@ -1,3 +1,4 @@
+
 MAINTAINERCLEANFILES = Makefile.in

 EXTRA_DIST = \
--- a/legacy/evas/src/modules/engines/buffer/Makefile.am
+++ b/legacy/evas/src/modules/engines/buffer/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@

 if BUILD_ENGINE_BUFFER

@ -15,7 +19,7 @@ evas_engine.c \
 evas_outbuf.c

 module_la_LIBADD = $(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 =  @create_shared_lib@ -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Buffer.h
--- a/legacy/evas/src/modules/engines/cairo_common/Makefile.am
+++ b/legacy/evas/src/modules/engines/cairo_common/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. \
+AM_CPPFLAGS	     = -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
 		       @FREETYPE_CFLAGS@ @CAIRO_CFLAGS@
--- a/legacy/evas/src/modules/engines/cairo_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/cairo_x11/Makefile.am
@ -1,8 +1,7 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

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

 if BUILD_ENGINE_CAIRO_X11

@ -16,7 +15,7 @@ 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_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/engines/direct3d/Makefile.am
+++ b/legacy/evas/src/modules/engines/direct3d/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@

 if BUILD_ENGINE_DIRECT3D

@ -17,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 -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Direct3D.h
--- a/legacy/evas/src/modules/engines/directfb/Makefile.am
+++ b/legacy/evas/src/modules/engines/directfb/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @DIRECTFB_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+@FREETYPE_CFLAGS@ \
+@DIRECTFB_CFLAGS@

 if BUILD_ENGINE_DIRECTFB

@ -17,7 +21,7 @@ evas_engine_dfb_image_objects.h \
 evas_engine_dfb.h

 module_la_LIBADD = @DIRECTFB_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_DirectFB.h
--- a/legacy/evas/src/modules/engines/fb/Makefile.am
+++ b/legacy/evas/src/modules/engines/fb/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@

 if BUILD_ENGINE_FB

@ -18,7 +22,7 @@ evas_outbuf.c

 module_la_DEPENDENCIES = $(top_builddir)/config.h
 module_la_LIBADD = $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version

 include_HEADERS = Evas_Engine_FB.h

--- a/legacy/evas/src/modules/engines/gl_common/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_common/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @gl_cflags@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+@FREETYPE_CFLAGS@ \
+@gl_cflags@

 if BUILD_ENGINE_GL_COMMON

@ -21,7 +25,6 @@ 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_DEPENDENCIES = $(top_builddir)/config.h

 endif
--- a/legacy/evas/src/modules/engines/gl_glew/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_glew/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines/gl_common @FREETYPE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines/gl_common \
+@FREETYPE_CFLAGS@

 if BUILD_ENGINE_GL_GLEW

@ -16,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 -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_GL_Glew.h
--- a/legacy/evas/src/modules/engines/gl_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
@ -1,8 +1,14 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	     = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines/gl_common @FREETYPE_CFLAGS@ @x_cflags@ @gl_cflags@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines/gl_common \
+@FREETYPE_CFLAGS@ \
+@x_cflags@ \
+@gl_cflags@

 if BUILD_ENGINE_GL_X11

@ -16,7 +22,7 @@ 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_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_GL_X11.h
--- a/legacy/evas/src/modules/engines/glitz_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/glitz_x11/Makefile.am
@ -1,8 +1,14 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@ @x_cflags@ @GLITZ_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@ \
+@x_cflags@ \
+@GLITZ_CFLAGS@

 if BUILD_ENGINE_GLITZ_X11

@ -19,7 +25,7 @@ evas_engine_font.c \
 evas_engine_gradient.c

 module_la_LIBADD = @x_libs@ @GLITZ_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Glitz_X11.h
--- a/legacy/evas/src/modules/engines/software_16/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@

 if BUILD_ENGINE_SOFTWARE_16

@ -23,7 +27,7 @@ evas_soft16_polygon.c \
 evas_soft16_line.c

 module_la_LIBADD = $(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 = @create_shared_lib@ -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 endif
--- a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
@ -1,8 +1,13 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines -I$(top_srcdir)/src/modules/engines/software_16 @FREETYPE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+-I$(top_srcdir)/src/modules/engines/software_16 \
+@FREETYPE_CFLAGS@

 if BUILD_ENGINE_SOFTWARE_16_DDRAW

@ -17,7 +22,7 @@ evas_ddraw_buffer.c \
 evas_ddraw_main.c

 module_la_LIBADD = @ddraw_16_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 = @create_shared_lib@ -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Software_16_DDraw.h
--- a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
@ -1,8 +1,14 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines -I$(top_srcdir)/src/modules/engines/software_16 @FREETYPE_CFLAGS@ @x_cflags@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+-I$(top_srcdir)/src/modules/engines/software_16 \
+@FREETYPE_CFLAGS@ \
+ @x_cflags@

 if BUILD_ENGINE_SOFTWARE_16_X11

@ -16,7 +22,7 @@ evas_engine.c \
 evas_x_buffer.c

 module_la_LIBADD = @x_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Software_16_X11.h
--- a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@

 if BUILD_ENGINE_SOFTWARE_DDRAW

@ -17,7 +21,7 @@ evas_ddraw_buffer.c \
 evas_ddraw_main.c

 module_la_LIBADD = @ddraw_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 = @create_shared_lib@ -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Software_DDraw.h
--- a/legacy/evas/src/modules/engines/software_generic/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am
@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@

 pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)

@ -11,5 +15,5 @@ module_la_SOURCES  = \
 evas_engine.c

 module_la_LIBADD = $(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 = @create_shared_lib@ -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
--- a/legacy/evas/src/modules/engines/software_qtopia/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_qtopia/Makefile.am
@ -1,10 +1,15 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@ @qt_cflags@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@ \
+@qt_cflags@

-CXXFLAGS = $(CFLAGS) -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -DNO_DEBUG 
+AM_CXXFLAGS = $(CFLAGS) -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -DNO_DEBUG 

 if BUILD_ENGINE_SOFTWARE_QTOPIA

@ -18,7 +23,7 @@ evas_outbuf.c \
 evas_qt_main.cpp

 module_la_LIBADD = @qt_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Software_Qtopia.h
--- a/legacy/evas/src/modules/engines/software_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
@ -1,8 +1,13 @@
-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@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@ \
+@sdl_cflags@

 if BUILD_ENGINE_SDL

@ -15,7 +20,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 = @create_shared_lib@ -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_SDL.h
--- a/legacy/evas/src/modules/engines/software_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_x11/Makefile.am
@ -1,8 +1,13 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@ @x_cflags@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@ \
+@x_cflags@

 if BUILD_ENGINE_SOFTWARE_X11

@ -19,7 +24,7 @@ evas_x_color.c \
 evas_x_main.c

 module_la_LIBADD = @x_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Software_X11.h
--- a/legacy/evas/src/modules/engines/software_xcb/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_xcb/Makefile.am
@ -1,8 +1,13 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@ @xcb_cflags@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@ \
+@xcb_cflags@

 if BUILD_ENGINE_SOFTWARE_XCB

@ -18,7 +23,7 @@ evas_xcb_color.c \
 evas_xcb_main.c

 module_la_LIBADD = @xcb_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_Software_Xcb.h
--- a/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
@ -1,8 +1,13 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@ @x_cflags@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@ \
+@x_cflags@

 if BUILD_ENGINE_XRENDER_X11

@ -19,7 +24,7 @@ evas_engine_font.c \
 evas_engine_gradient.c

 module_la_LIBADD = @x_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_XRender_X11.h
--- a/legacy/evas/src/modules/engines/xrender_xcb/Makefile.am
+++ b/legacy/evas/src/modules/engines/xrender_xcb/Makefile.am
@ -1,8 +1,13 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign

 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines @FREETYPE_CFLAGS@ @xcbrender_cflags@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-I$(top_srcdir)/src/modules/engines \
+@FREETYPE_CFLAGS@ \
+@xcbrender_cflags@

 if BUILD_ENGINE_XRENDER_XCB

@ -19,7 +24,7 @@ evas_engine_font.c \
 evas_engine_gradient.c

 module_la_LIBADD = @xcbrender_libs@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h

 include_HEADERS = Evas_Engine_XRender_Xcb.h
--- a/legacy/evas/src/modules/loaders/edb/Makefile.am
+++ b/legacy/evas/src/modules/loaders/edb/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @EDB_CFLAGS@
@ -17,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 -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/loaders/eet/Makefile.am
+++ b/legacy/evas/src/modules/loaders/eet/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @EET_CFLAGS@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/loaders/gif/Makefile.am
+++ b/legacy/evas/src/modules/loaders/gif/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @gif_cflags@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/loaders/jpeg/Makefile.am
+++ b/legacy/evas/src/modules/loaders/jpeg/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @jpeg_cflags@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/loaders/png/Makefile.am
+++ b/legacy/evas/src/modules/loaders/png/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @png_cflags@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/loaders/svg/Makefile.am
+++ b/legacy/evas/src/modules/loaders/svg/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @svg_cflags@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/loaders/tiff/Makefile.am
+++ b/legacy/evas/src/modules/loaders/tiff/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @tiff_cflags@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/loaders/xpm/Makefile.am
+++ b/legacy/evas/src/modules/loaders/xpm/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @xpm_cflags@
@ -17,7 +13,7 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = evas_image_load_xpm.c

 module_la_LIBADD       = $(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      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/savers/edb/Makefile.am
+++ b/legacy/evas/src/modules/savers/edb/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @EDB_CFLAGS@
@ -17,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 -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/savers/eet/Makefile.am
+++ b/legacy/evas/src/modules/savers/eet/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @EET_CFLAGS@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/savers/jpeg/Makefile.am
+++ b/legacy/evas/src/modules/savers/jpeg/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @jpeg_cflags@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/savers/png/Makefile.am
+++ b/legacy/evas/src/modules/savers/png/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @png_cflags@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h

--- a/legacy/evas/src/modules/savers/tiff/Makefile.am
+++ b/legacy/evas/src/modules/savers/tiff/Makefile.am
@ -1,11 +1,7 @@
-## Process this file with automake to produce Makefile.in

-AUTOMAKE_OPTIONS     = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in

-INCLUDES	       = -I. \
+AM_CPPFLAGS	       = -I. \
 			 -I$(top_srcdir)/src/lib \
 			 -I$(top_srcdir)/src/lib/include \
 			 @FREETYPE_CFLAGS@ @tiff_cflags@
@ -17,7 +13,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_LDFLAGS      = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
+module_la_LDFLAGS      = @create_shared_lib@ -module -avoid-version

 module_la_DEPENDENCIES = $(top_builddir)/config.h