From 5886a2ed27a111c239d0de79c3e87fc500bc4d2e Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Sat, 4 Jun 2011 05:33:37 +0000
Subject: [PATCH] fix static link of the generic loader and psd loader

SVN revision: 59951
---
 legacy/evas/src/lib/Makefile.am        | 15 +++++---
 legacy/evas/src/lib/file/evas_module.c | 68 ++++++++++++++++++----------------
 2 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am
index e901a9b..441d288 100644
--- a/legacy/evas/src/lib/Makefile.am
+++ b/legacy/evas/src/lib/Makefile.am
@@ -110,6 +110,11 @@ SUBDIRS += ../modules/savers/eet ../modules/loaders/eet
 EVAS_STATIC_MODULE += ../modules/savers/eet/libevas_saver_eet.la ../modules/loaders/eet/libevas_loader_eet.la
 EVAS_STATIC_LIBADD += @evas_image_loader_eet_libs@
 endif
+if EVAS_STATIC_BUILD_GENERIC
+SUBDIRS += ../modules/loaders/generic
+EVAS_STATIC_MODULE += ../modules/loaders/generic/libevas_loader_generic.la
+EVAS_STATIC_LIBADD += @evas_image_loader_generic_libs@
+endif
 if EVAS_STATIC_BUILD_GIF
 SUBDIRS += ../modules/loaders/gif
 EVAS_STATIC_MODULE += ../modules/loaders/gif/libevas_loader_gif.la
@@ -139,6 +144,11 @@ SUBDIRS += ../modules/savers/png ../modules/loaders/png
 EVAS_STATIC_MODULE += ../modules/savers/png/libevas_saver_png.la ../modules/loaders/png/libevas_loader_png.la
 EVAS_STATIC_LIBADD += @evas_image_loader_png_libs@
 endif
+if EVAS_STATIC_BUILD_PSD
+SUBDIRS += ../modules/loaders/psd
+EVAS_STATIC_MODULE += ../modules/loaders/psd/libevas_loader_psd.la
+EVAS_STATIC_LIBADD += @evas_image_loader_psd_libs@
+endif
 if EVAS_STATIC_BUILD_SVG
 SUBDIRS += ../modules/loaders/svg
 EVAS_STATIC_MODULE += ../modules/loaders/svg/libevas_loader_svg.la
@@ -164,11 +174,6 @@ SUBDIRS += ../modules/loaders/xpm
 EVAS_STATIC_MODULE += ../modules/loaders/xpm/libevas_loader_xpm.la
 EVAS_STATIC_LIBADD += @evas_image_loader_xpm_libs@
 endif
-if EVAS_STATIC_BUILD_PSD
-SUBDIRS += ../modules/loaders/psd
-EVAS_STATIC_MODULE += ../modules/loaders/psd/libevas_loader_psd.la
-EVAS_STATIC_LIBADD += @evas_image_loader_psd_libs@
-endif
 
 AM_CPPFLAGS = \
 -I. \
diff --git a/legacy/evas/src/lib/file/evas_module.c b/legacy/evas/src/lib/file/evas_module.c
index 1098822..7531dcd 100644
--- a/legacy/evas/src/lib/file/evas_module.c
+++ b/legacy/evas/src/lib/file/evas_module.c
@@ -108,20 +108,21 @@ EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_gdi);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_generic);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_sdl);
 EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_x11);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, xpm);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, bmp);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tiff);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, svg);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, png);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, pmaps);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, jpeg);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, gif);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, eet);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, edb);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tga);
-EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, wbmp);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, eet);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, generic);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, gif);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, ico);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, jpeg);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, pmaps);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, png);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, psd);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, svg);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tga);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, tiff);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, wbmp);
+EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, xpm);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, edb);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, eet);
 EVAS_EINA_STATIC_MODULE_DEFINE(image_saver, jpeg);
@@ -186,44 +187,50 @@ static const struct {
 #ifdef EVAS_STATIC_BUILD_SOFTWARE_X11
   EVAS_EINA_STATIC_MODULE_USE(engine, software_x11),
 #endif
-#ifdef EVAS_STATIC_BUILD_XPM
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, xpm),
-#endif
 #ifdef EVAS_STATIC_BUILD_BMP
   EVAS_EINA_STATIC_MODULE_USE(image_loader, bmp),
 #endif
-#ifdef EVAS_STATIC_BUILD_TIFF
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, tiff),
+#ifdef EVAS_STATIC_BUILD_EDB
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, edb),
 #endif
-#ifdef EVAS_STATIC_BUILD_SVG
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, svg),
+#ifdef EVAS_STATIC_BUILD_EET
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, eet),
 #endif
-#ifdef EVAS_STATIC_BUILD_PNG
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, png),
+#ifdef EVAS_STATIC_BUILD_GENERIC
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, generic),
 #endif
-#ifdef EVAS_STATIC_BUILD_PMAPS
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, pmaps),
+#ifdef EVAS_STATIC_BUILD_GIF
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, gif),
+#endif
+#ifdef EVAS_STATIC_BUILD_ICO
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, ico),
 #endif
 #ifdef EVAS_STATIC_BUILD_JPEG
   EVAS_EINA_STATIC_MODULE_USE(image_loader, jpeg),
 #endif
-#ifdef EVAS_STATIC_BUILD_GIF
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, gif),
+#ifdef EVAS_STATIC_BUILD_PMAPS
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, pmaps),
 #endif
-#ifdef EVAS_STATIC_BUILD_EET
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, eet),
+#ifdef EVAS_STATIC_BUILD_PNG
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, png),
 #endif
-#ifdef EVAS_STATIC_BUILD_EDB
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, edb),
+#ifdef EVAS_STATIC_BUILD_PSD
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, psd),
+#endif
+#ifdef EVAS_STATIC_BUILD_SVG
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, svg),
 #endif
 #ifdef EVAS_STATIC_BUILD_TGA
   EVAS_EINA_STATIC_MODULE_USE(image_loader, tga),
 #endif
+#ifdef EVAS_STATIC_BUILD_TIFF
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, tiff),
+#endif
 #ifdef EVAS_STATIC_BUILD_WBMP
   EVAS_EINA_STATIC_MODULE_USE(image_loader, wbmp),
 #endif
-#ifdef EVAS_STATIC_BUILD_ICO
-  EVAS_EINA_STATIC_MODULE_USE(image_loader, ico),
+#ifdef EVAS_STATIC_BUILD_XPM
+  EVAS_EINA_STATIC_MODULE_USE(image_loader, xpm),
 #endif
 #ifdef EVAS_STATIC_BUILD_EDB
   EVAS_EINA_STATIC_MODULE_USE(image_saver, edb),
@@ -240,9 +247,6 @@ static const struct {
 #ifdef EVAS_STATIC_BUILD_TIFF
   EVAS_EINA_STATIC_MODULE_USE(image_saver, tiff),
 #endif
-#ifdef EVAS_STATIC_BUILD_PSD
-  EVAS_EINA_STATIC_MODULE_USE(image_saver, psd),
-#endif
   { NULL, NULL }
 };
 
-- 
2.7.4