Make eet depends on eina.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eet@36842 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 9e97f23..aa85369 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,8 @@ if test "x$prefer_assert" = "xno"; then
 fi
 AC_SUBST(DEBUG_CFLAGS)
 
+PKG_CHECK_MODULES(EINA, [eina-0])
+
 EFL_CHECK_DOXYGEN([enable_doc="yes"], [enable_doc="no"])
 
 AC_OUTPUT([

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 024932f..b72b1d0 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -7,12 +7,13 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\"
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EINA_CFLAGS@
 
 bin_PROGRAMS = eet
 
 eet_SOURCES = eet_main.c
 eet_CFLAGS = @WIN32_CFLAGS@
-eet_LDADD = $(top_builddir)/src/lib/libeet.la
+eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@
 eet_LDFLAGS = @lt_enable_auto_import@
 eet_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 09e20df..f7c13fa 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 @EVIL_CFLAGS@ \
+@EINA_CFLAGS@ \
 @EFL_COVERAGE_CFLAGS@ \
 @OPENSSL_CFLAGS@
 
@@ -25,7 +26,7 @@ eet_dictionary.c \
 eet_utils.c
 
 libeet_la_CFLAGS = @WIN32_CFLAGS@
-libeet_la_LIBADD = @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg -lm
+libeet_la_LIBADD = @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ @EINA_LIBS@ -lz -ljpeg -lm
 libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
 
 EXTRA_DIST = Eet_private.h

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 72c766b..339f0e0 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -2,15 +2,15 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
-@CHECK_CFLAGS@
-
+@CHECK_CFLAGS@ \
+@EINA_CFLAGS@
 
 if EFL_ENABLE_TESTS
 
 check_PROGRAMS = eet_suite
 
 eet_suite_SOURCES = eet_suite.c eet_data_suite.c
-eet_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libeet.la
+eet_suite_LDADD = @EINA_LIBS@ @CHECK_LIBS@ $(top_builddir)/src/lib/libeet.la
 
 endif