jeyzu pushed a commit to branch master.
commit d3c5356cf3890cdfc211eac0805a26a642529e37
Author: Jérémy Zurcher <[email protected]>
Date: Thu May 30 23:47:35 2013 +0200
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 74b5db7..4689f7d 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 50f873c..3137731 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 a88f885..fc3ec35 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
--
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
