From 445347016ce541d7ae4665558e67040893a171d6 Mon Sep 17 00:00:00 2001 From: raster Date: Sat, 17 Mar 2012 06:25:41 +0000 Subject: [PATCH] and work more on getting release in shape - version requirements. (god this is a pain in the butt) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@69484 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 36 +++++++++++++++++----------------- src/modules/eet_snd_reader/Makefile.am | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 5feb334..8ac6b7c 100644 --- a/configure.ac +++ b/configure.ac @@ -258,37 +258,37 @@ fi PKG_CHECK_MODULES([MINIMAL], [ - eina >= 1.1.0 - eet >= 1.5.0 + eina >= 1.2.0 + eet >= 1.6.0 ]) PKG_CHECK_MODULES([EDJE], [ - eina >= 1.1.0 - eet >= 1.5.0 - evas >= 1.1.0 - ecore >= 1.1.0 - ecore-evas >= 1.1.0 - ecore-file >= 1.1.0 - embryo >= 1.1.0 + eina >= 1.2.0 + eet >= 1.6.0 + evas >= 1.2.0 + ecore >= 1.2.0 + ecore-evas >= 1.2.0 + ecore-file >= 1.2.0 + embryo >= 1.2.0 ]) EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" -requirement_edje="embryo >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0 ${requirement_edje}" +requirement_edje="embryo >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_edje}" requirement_edje="${requirement_lua} ${requirement_edje}" have_ecore_imf="no" PKG_CHECK_MODULES([ECORE_IMF], [ - ecore-imf >= 1.1.0 - ecore-imf-evas >= 1.1.0 + ecore-imf >= 1.2.0 + ecore-imf-evas >= 1.2.0 ], [ AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry]) have_ecore_imf="yes" - requirement_edje="ecore-imf-evas >= 1.1.0 ecore-imf >= 1.1.0 ${requirement_edje}" + requirement_edje="ecore-imf-evas >= 1.2.0 ecore-imf >= 1.2.0 ${requirement_edje}" ], [have_ecore_imf="no"]) @@ -445,26 +445,26 @@ fi # Dependencies for the binaries if test "x$have_edje_cc" = "xyes"; then - PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0]) EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" fi AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"]) if test "x$have_edje_decc" = "xyes"; then - PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0]) fi if test "x$have_edje_player" = "xyes"; then - PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) fi if test "x$have_edje_inspector" = "xyes"; then - PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) fi if test "x$have_edje_external_inspector" = "xyes"; then - PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0]) + PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0]) fi diff --git a/src/modules/eet_snd_reader/Makefile.am b/src/modules/eet_snd_reader/Makefile.am index c154dc2..c5ef7c9 100644 --- a/src/modules/eet_snd_reader/Makefile.am +++ b/src/modules/eet_snd_reader/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -pkglibdir = $(REMIX_PLUGIN_DIR) +pkglibdir = $(DESTDIR)$(REMIX_PLUGIN_DIR) AM_CPPFLAGS = \ -I. \ @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ @EDJE_CFLAGS@ \ @REMIX_CFLAGS@ -pkgdir = $(REMIX_PLUGIN_DIR) +pkgdir = $(DESTDIR)$(REMIX_PLUGIN_DIR) pkg_LTLIBRARIES = libeet_sndfile_reader.la libeet_sndfile_reader_la_SOURCES = eet_snd_reader.c -- 2.7.4