From 3bd0f558e5290f5ad74324d602a11e5b128e761b Mon Sep 17 00:00:00 2001 From: gastal Date: Mon, 2 Jul 2012 19:38:54 +0000 Subject: [PATCH] Unbreak eet examples(they need Eina). Previous commit caused build(not system) error for examples. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eet@73169 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 3 +++ src/examples/Makefile.am | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 4f91427..5dbc929 100644 --- a/configure.ac +++ b/configure.ac @@ -223,6 +223,9 @@ case "$host_os" in esac AC_SUBST(EFL_EET_BUILD) +PKG_CHECK_MODULES(EINA, [eina >= 1.2.0]) +requirement_eet="eina >= 1.2.0 ${requirement_eet}" + # Exotic library for copilation on Coyote PKG_CHECK_EXISTS([exotic], diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index 343fbed..6c5a324 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -5,30 +5,31 @@ examplesdir = $(datadir)/$(PACKAGE)/examples if BUILD_EXAMPLES AM_CPPFLAGS = \ -I. \ --I$(top_srcdir)/src/lib +-I$(top_srcdir)/src/lib \ +@EINA_CFLAGS@ examples_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher eet_basic_SOURCES = eet-basic.c -eet_basic_LDADD = $(top_builddir)/src/lib/libeet.la +eet_basic_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ eet_file_SOURCES = eet-file.c -eet_file_LDADD = $(top_builddir)/src/lib/libeet.la +eet_file_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ eet_data_simple_SOURCES = eet-data-simple.c -eet_data_simple_LDADD = $(top_builddir)/src/lib/libeet.la +eet_data_simple_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ eet_data_nested_SOURCES = eet-data-nested.c -eet_data_nested_LDADD = $(top_builddir)/src/lib/libeet.la +eet_data_nested_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c -eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/libeet.la +eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c -eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/libeet.la +eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c -eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/libeet.la +eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ endif -- 2.7.4