From f08f865b75209074419c393efa82ab57f9173707 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 20 Oct 2008 09:17:00 +0000 Subject: [PATCH] Make eet depends on eina. SVN revision: 36842 --- legacy/eet/configure.ac | 2 ++ legacy/eet/src/bin/Makefile.am | 5 +++-- legacy/eet/src/lib/Makefile.am | 3 ++- legacy/eet/src/tests/Makefile.am | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index 9e97f234cf..aa85369998 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/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/legacy/eet/src/bin/Makefile.am b/legacy/eet/src/bin/Makefile.am index 024932f02f..b72b1d0a71 100644 --- a/legacy/eet/src/bin/Makefile.am +++ b/legacy/eet/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/legacy/eet/src/lib/Makefile.am b/legacy/eet/src/lib/Makefile.am index 09e20df895..f7c13fa1a4 100644 --- a/legacy/eet/src/lib/Makefile.am +++ b/legacy/eet/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/legacy/eet/src/tests/Makefile.am b/legacy/eet/src/tests/Makefile.am index 72c766b6e6..339f0e0a4f 100644 --- a/legacy/eet/src/tests/Makefile.am +++ b/legacy/eet/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