From d3c5356cf3890cdfc211eac0805a26a642529e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 30 May 2013 23:47:35 +0200 Subject: [PATCH] Makefile: compilation succed without png support use --enable-image-loader-png=no related to T64 and D133 --- src/Makefile_Emotion.am | 2 ++ src/Makefile_Ethumb.am | 2 ++ src/examples/edje/Makefile.am | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am index 74b5db7689..4689f7d135 100644 --- a/src/Makefile_Emotion.am +++ b/src/Makefile_Emotion.am @@ -142,6 +142,7 @@ edje_external_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static ### Unit tests if EFL_ENABLE_TESTS +if BUILD_LOADER_PNG bin_PROGRAMS += tests/emotion/emotion_test @@ -194,6 +195,7 @@ emotiondatafilesdir = $(datadir)/emotion/data emotiondatafiles_DATA = tests/emotion/data/theme.edj CLEANFILES += tests/emotion/data/theme.edj endif +endif EXTRA_DIST += \ $(EMOTION_DATA_FILES) \ diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am index 50f873ca1f..3137731923 100644 --- a/src/Makefile_Ethumb.am +++ b/src/Makefile_Ethumb.am @@ -27,6 +27,7 @@ lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ## Modules # Emotion +if BUILD_LOADER_PNG ethumbmoduleemotiondir = $(libdir)/ethumb/modules/emotion/$(MODULE_ARCH) ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la modules_ethumb_emotion_module_la_SOURCES = \ @@ -57,6 +58,7 @@ CLEANFILES += modules/ethumb/emotion/template.edj EXTRA_DIST += \ modules/ethumb/emotion/template.edc \ modules/ethumb/emotion/placeholder.png +endif ### Binary diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am index a88f885eeb..fc3ec351b1 100644 --- a/src/examples/edje/Makefile.am +++ b/src/examples/edje/Makefile.am @@ -205,6 +205,8 @@ uninstall-local: done if ALWAYS_BUILD_EXAMPLES +if BUILD_LOADER_PNG noinst_PROGRAMS = $(EXTRA_PROGRAMS) nodist_pkgdata_DATA = $(EDJS) endif +endif