Evas jpeg saver: don't build and fix static build on Windows (jpeg saver does not...

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@57361 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0b873e1..382e26e 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -134,8 +134,12 @@ EVAS_STATIC_MODULE += ../modules/loaders/gif/libevas_loader_gif.la
 EVAS_STATIC_LIBADD += @evas_image_loader_gif_libs@
 endif
 if EVAS_STATIC_BUILD_JPEG
-SUBDIRS += ../modules/savers/jpeg ../modules/loaders/jpeg
-EVAS_STATIC_MODULE += ../modules/savers/jpeg/libevas_saver_jpeg.la ../modules/loaders/jpeg/libevas_loader_jpeg.la
+SUBDIRS += ../modules/loaders/jpeg
+EVAS_STATIC_MODULE += ../modules/loaders/jpeg/libevas_loader_jpeg.la
+if BUILD_SAVER_JPEG
+SUBDIRS += ../modules/savers/jpeg
+EVAS_STATIC_MODULE += ../modules/savers/jpeg/libevas_saver_jpeg.la
+endif
 EVAS_STATIC_LIBADD += @evas_image_loader_jpeg_libs@
 endif
 if EVAS_STATIC_BUILD_PMAPS

diff --git a/src/modules/savers/jpeg/Makefile.am b/src/modules/savers/jpeg/Makefile.am
index 63c8fd9..7d86faa 100644 (file)
--- a/src/modules/savers/jpeg/Makefile.am
+++ b/src/modules/savers/jpeg/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS= \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-if BUILD_LOADER_JPEG
+if BUILD_SAVER_JPEG
 if !EVAS_STATIC_BUILD_JPEG
 
 pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)