summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-12-04 18:01:02 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-12-04 18:01:02 +0000
commitc49fd9d32b0e4c76b50cf71c8478ffc4d8dfec25 (patch)
treecc14e4b53fbb57c28dc61479b96417f2be2d3846
parent81c86b19f6b432c5d6701bd025d5b2cf308fba4c (diff)
downloadefl-c49fd9d32b0e4c76b50cf71c8478ffc4d8dfec25.tar.gz
and update eio.pc.in too (+ minor stuff)
SVN revision: 80184
-rw-r--r--configure.ac4
-rw-r--r--pc/eio.pc.in4
-rw-r--r--src/Makefile_Eio.am6
3 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index b7d0254adb..ce4045fd0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4064,6 +4064,10 @@ AC_MSG_NOTICE([Eio checks])
requirements_pc_eio="ecore >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_eio}"
+requirements_libs_eio="${requirements_libs_eio} -lm"
+EIO_LIBS=${requirements_pc_eio}
+AC_SUBST([EIO_LIBS])
+
### Checks for header files
AC_CHECK_HEADERS([grp.h pwd.h])
diff --git a/pc/eio.pc.in b/pc/eio.pc.in
index 24e409b824..b599f78cf2 100644
--- a/pc/eio.pc.in
+++ b/pc/eio.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
Name: eio
Description: Enlightenned Asynchronous Input Output library
-@pkgconfig_requires_private@: @requirements_eio@
+Requires.private: @requirements_pc_eio@
Version: @VERSION@
Libs: -L${libdir} -leio
-Libs.private: -lm
+Libs.private: @requirements_libs_eio@
Cflags: -I${includedir}/eio-@VMAJ@
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 93f4d25f93..28286b455b 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -38,13 +38,15 @@ lib_eio_libeio_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/eio \
-DEFL_EIO_BUILD \
-@EFL_CFLAGS@
+@EFL_CFLAGS@ \
+@EFL_COV_CFLAGS@
lib_eio_libeio_la_LIBADD = \
lib/eina/libeina.la \
lib/eo/libeo.la \
lib/eet/libeet.la \
lib/ecore/libecore.la \
--lm
+@EIO_LIBS@ \
+@EFL_COV_LIBS@
lib_eio_libeio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@