[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. 00a54b97536aa9ded13ec8505d14a50a99338b40

doursse doursse at alioth.debian.org
Sat Jun 7 18:20:29 UTC 2008


The following commit has been merged in the upstream-vcs branch:
commit 14771becfce9b12a3d80d2889dc329a4fe74ed3c
Author: doursse <doursse>
Date:   Sat Jun 7 08:03:52 2008 +0000

    ecore-evas is needed only for the binaries

diff --git a/configure.in b/configure.in
index f634446..3324494 100644
--- a/configure.in
+++ b/configure.in
@@ -76,7 +76,6 @@ AC_ARG_ENABLE(edje-cc, [  --disable-edje-cc       disable building of edje_cc ],
 
 PKG_CHECK_MODULES(EDJE, [
   evas >= 0.9.9
-  ecore-evas >= 0.9.9
   ecore-job >= 0.9.9
   eet >= 1.0.1
   embryo >= 0.9.1
@@ -86,6 +85,10 @@ PKG_CHECK_MODULES(ECORE_FILE, [
   ecore-file >= 0.9.9
 ])
 
+PKG_CHECK_MODULES(ECORE_EVAS, [
+  ecore-evas >= 0.9.9
+])
+
 AC_MSG_CHECKING([for location of Vim data files])
 install_vim="yes";
 AC_ARG_WITH(vim,
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 7d3780f..0ac94ee 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 @EDJE_CFLAGS@ \
+ at ECORE_EVAS_CFLAGS@ \
 @ECORE_FILE_CFLAGS@ \
 @EVIL_CFLAGS@
 
@@ -49,7 +50,7 @@ edje_prefix.h \
 edje_main.h
 
 edje_cc_CFLAGS = @WIN32_CFLAGS@
-edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(EVIL_LIBS)
+edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS)
 edje_cc_LDFLAGS = @lt_enable_auto_import@
 edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
 
@@ -61,6 +62,6 @@ edje_cc_mem.c \
 edje_cc_sources.c
 
 edje_decc_CFLAGS = @WIN32_CFLAGS@
-edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(ECORE_FILE_LIBS) $(EVIL_LIBS)
+edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la $(EDJE_LIBS) $(ECORE_EVAS_LIBS) $(ECORE_FILE_LIBS) $(EVIL_LIBS)
 edje_decc_LDFLAGS = @lt_enable_auto_import@
 edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la

-- 
Enlightenment DR17 graphical layout and animation library



More information about the Pkg-e-commits mailing list