From 70396fe8a098080e081afd740b70723ede9fe1df Mon Sep 17 00:00:00 2001 From: cedric Date: Mon, 13 Oct 2008 16:00:19 +0000 Subject: [PATCH] Make efreet depend on eina. No change in the code yet, so just fix your build system and no bug must show up. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@36625 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 1 + src/bin/Makefile.am | 7 ++++--- src/bin/compare/Makefile.am | 5 +++-- src/lib/Makefile.am | 9 +++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 8773948..6e48e78 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ AC_FUNC_ALLOCA PCFLAGS=$CFLAGS PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-file >= 0.9.9]) +PKG_CHECK_MODULES([EINA], [eina-0]) CFLAGS=$ECORE_CFLAGS" "$CFLAGS diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 43add38..ad1888b 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/lib \ @ECORE_CFLAGS@ \ +@EINA_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" @@ -17,7 +18,7 @@ efreet_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la \ $(top_builddir)/src/lib/libefreet_mime.la efreet_test_LDADD = $(top_builddir)/src/lib/libefreet.la \ $(top_builddir)/src/lib/libefreet_mime.la \ - @ECORE_LIBS@ + @ECORE_LIBS@ @EINA_LIBS@ efreet_test_SOURCES = \ ef_test.h \ ef_data_dirs.c \ @@ -35,11 +36,11 @@ ef_locale.c endif efreet_spec_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la -efreet_spec_test_LDADD = $(top_builddir)/src/lib/libefreet.la +efreet_spec_test_LDADD = $(top_builddir)/src/lib/libefreet.la @EINA_LIBS@ efreet_spec_test_SOURCES = \ efreet_spec_test.c efreet_cache_test_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la -efreet_cache_test_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ +efreet_cache_test_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@ efreet_cache_test_SOURCES = \ ef_cache.c diff --git a/src/bin/compare/Makefile.am b/src/bin/compare/Makefile.am index b04da8b..659f6b3 100644 --- a/src/bin/compare/Makefile.am +++ b/src/bin/compare/Makefile.am @@ -3,15 +3,16 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I. \ -I$(top_srcdir)/src/lib \ +@EINA_CFLAGS@ \ @ECORE_CFLAGS@ bin_PROGRAMS = efreet_alloc efreet_menu_alloc efreet_menu_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la efreet_menu_alloc_SOURCES = efreet_menu_alloc.c comp.h -efreet_menu_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ +efreet_menu_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@ efreet_alloc_DEPENDENCIES = $(top_builddir)/src/lib/libefreet.la efreet_alloc_SOURCES = efreet_alloc.c comp.h -efreet_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ +efreet_alloc_LDADD = $(top_builddir)/src/lib/libefreet.la @ECORE_LIBS@ @EINA_LIBS@ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index c304b48..f94a398 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -4,7 +4,8 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -@ECORE_CFLAGS@ +@ECORE_CFLAGS@ \ +@EINA_CFLAGS@ lib_LTLIBRARIES = libefreet.la libefreet_mime.la libefreet_trash.la @@ -60,8 +61,8 @@ $(EFREETTRASHSOURCES) installed_headersdir = $(prefix)/include/efreet installed_headers_DATA = $(EFREETHEADERS) $(EFREETMIMEHEADERS) $(EFREETTRASHHEADERS) -libefreet_la_LIBADD = @ECORE_LIBS@ +libefreet_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet_la_LDFLAGS = -version-info @version_info@ -libefreet_mime_la_LIBADD = @ECORE_LIBS@ libefreet.la -libefreet_trash_la_LIBADD = @ECORE_LIBS@ libefreet.la +libefreet_mime_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la +libefreet_trash_la_LIBADD = @ECORE_LIBS@ @EINA_LIBS@ libefreet.la -- 2.7.4