From: caro Date: Mon, 14 Mar 2011 20:33:44 +0000 (+0000) Subject: Evas: formatting and add ico module building X-Git-Tag: submit/trunk/20120815.174732~1834 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07b72339cff2558ebae70fd85eed824f4c9d168b;p=profile%2Fivi%2Fevas.git Evas: formatting and add ico module building 1) i like alphabetical order (build order of modules and configure output 2) ico module was not built git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@57747 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/configure.ac b/configure.ac index 3407e69..e1612bd 100644 --- a/configure.ac +++ b/configure.ac @@ -1693,19 +1693,19 @@ echo " Software 16bit WinCE.......: $have_evas_engine_software_16_wince" echo " Software 16bit SDL.........: $have_evas_engine_software_sdl (primitive: $sdl_primitive)" echo echo "Image Loaders:" +echo " BMP.....................: $have_evas_image_loader_bmp" echo " EDB.....................: $have_evas_image_loader_edb" echo " EET.....................: $have_evas_image_loader_eet" echo " GIF.....................: $have_evas_image_loader_gif" +echo " ICO.....................: $have_evas_image_loader_ico" echo " JPEG....................: $have_evas_image_loader_jpeg (region: $have_jpeg_region)" echo " PMAPS...................: $have_evas_image_loader_pmaps" echo " PNG.....................: $have_evas_image_loader_png" echo " SVG.....................: $have_evas_image_loader_svg" -echo " TIFF....................: $have_evas_image_loader_tiff" -echo " XPM.....................: $have_evas_image_loader_xpm" -echo " BMP.....................: $have_evas_image_loader_bmp" echo " TGA.....................: $have_evas_image_loader_tga" +echo " TIFF....................: $have_evas_image_loader_tiff" echo " WBMP....................: $have_evas_image_loader_wbmp" -echo " ICO.....................: $have_evas_image_loader_ico" +echo " XPM.....................: $have_evas_image_loader_xpm" echo echo "Font Sourcing Systems:" echo " EET.....................: $have_evas_font_loader_eet" diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am index e1ed01d..222bef1 100644 --- a/src/modules/loaders/Makefile.am +++ b/src/modules/loaders/Makefile.am @@ -2,6 +2,12 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = +if BUILD_LOADER_BMP +if !EVAS_STATIC_BUILD_BMP +SUBDIRS += bmp +endif +endif + if BUILD_LOADER_EDB if !EVAS_STATIC_BUILD_EDB SUBDIRS += edb @@ -20,6 +26,12 @@ SUBDIRS += gif endif endif +if BUILD_LOADER_ICO +if !EVAS_STATIC_BUILD_ICO +SUBDIRS += ico +endif +endif + if BUILD_LOADER_JPEG if !EVAS_STATIC_BUILD_JPEG SUBDIRS += jpeg @@ -44,33 +56,27 @@ SUBDIRS += svg endif endif -if BUILD_LOADER_TIFF -if !EVAS_STATIC_BUILD_TIFF -SUBDIRS += tiff -endif -endif - -if BUILD_LOADER_XPM -if !EVAS_STATIC_BUILD_XPM -SUBDIRS += xpm -endif -endif - -if BUILD_LOADER_BMP -if !EVAS_STATIC_BUILD_BMP -SUBDIRS += bmp -endif -endif - if BUILD_LOADER_TGA if !EVAS_STATIC_BUILD_TGA SUBDIRS += tga endif endif +if BUILD_LOADER_TIFF +if !EVAS_STATIC_BUILD_TIFF +SUBDIRS += tiff +endif +endif + if BUILD_LOADER_WBMP if !EVAS_STATIC_BUILD_WBMP SUBDIRS += wbmp endif endif +if BUILD_LOADER_XPM +if !EVAS_STATIC_BUILD_XPM +SUBDIRS += xpm +endif +endif +