summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2010-08-17 13:29:23 +0000
committerCedric BAIL <cedric.bail@free.fr>2010-08-17 13:29:23 +0000
commitb0ddc29966c4155c8ae39e4734a75f67cc3b1ad5 (patch)
treefc348492c565f3934c42549384fcac00c7a98fa7 /legacy/emotion
parentb6f316407f1284bcefc8663177f481224f537ed0 (diff)
* edje: fix edje external module path.
SVN revision: 51251
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/configure.ac8
-rw-r--r--legacy/emotion/src/edje_external/Makefile.am2
2 files changed, 8 insertions, 2 deletions
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index c6c13942f5..83ae06d369 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -54,20 +54,26 @@ VMAJ=v_maj
54AC_SUBST(VMAJ) 54AC_SUBST(VMAJ)
55 55
56### Needed information 56### Needed information
57EDJE_VERSION="1.0.0"
57 58
58case "$host_os" in 59case "$host_os" in
59 mingw* | cegcc*) 60 mingw* | cegcc*)
61 MODULE_EDJE="$host_os-$host_cpu"
60 want_xine="no" 62 want_xine="no"
61 want_gstreamer="yes" 63 want_gstreamer="yes"
62 want_vlc="no" 64 want_vlc="no"
63 ;; 65 ;;
64 *) 66 *)
67 MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
65 want_xine="yes" 68 want_xine="yes"
66 want_gstreamer="yes" 69 want_gstreamer="yes"
67 want_vlc="yes" 70 want_vlc="yes"
68 ;; 71 ;;
69esac 72esac
70 73
74AC_SUBST(MODULE_EDJE)
75AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
76
71requirement_emotion="" 77requirement_emotion=""
72 78
73### Additional options to configure 79### Additional options to configure
@@ -112,7 +118,7 @@ PKG_CHECK_MODULES(EMOTION, [eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0])
112requirement_emotion="ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0" 118requirement_emotion="ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0"
113 119
114if test "x${have_emotion_test}" = "xyes" ; then 120if test "x${have_emotion_test}" = "xyes" ; then
115 PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 edje >= 1.0.0]) 121 PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 edje >= ${EDJE_VERSION}])
116fi 122fi
117 123
118PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.0.0], [have_ecore_x="yes"], [have_ecore_x="no"]) 124PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.0.0], [have_ecore_x="yes"], [have_ecore_x="no"])
diff --git a/legacy/emotion/src/edje_external/Makefile.am b/legacy/emotion/src/edje_external/Makefile.am
index ff3b5c9aa8..177090ac6a 100644
--- a/legacy/emotion/src/edje_external/Makefile.am
+++ b/legacy/emotion/src/edje_external/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
9@EFL_EMOTION_BUILD@ \ 9@EFL_EMOTION_BUILD@ \
10@EDJE_EXTERNAL_CFLAGS@ 10@EDJE_EXTERNAL_CFLAGS@
11 11
12pkgdir = $(libdir)/edje 12pkgdir = $(libdir)/edje/modules/$(MODULE_EDJE)
13pkg_LTLIBRARIES = emotion.la 13pkg_LTLIBRARIES = emotion.la
14 14
15emotion_la_SOURCES = emotion.c 15emotion_la_SOURCES = emotion.c