raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=43c7552411379c17e5548dd1d22375a7847bfa2c
commit 43c7552411379c17e5548dd1d22375a7847bfa2c
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Sun Sep 21 11:11:28 2014 +0900
elm - we should not get our pc files to use hidden libs like x/wl
ecore_x, ecore_wl, ecore_drm etc. were being linked to clients as they
were added to the pc file - they should not have been. elm hides
these. it's meant to hide them. remove them from the pc file.
---
Makefile.am | 1 +
configure.ac | 10 ++++++++--
elementary-cxx.pc.in | 2 +-
elementary.pc.in | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e85ba36..70f7a92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,7 @@ $(SED) \
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \
-e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \
+-e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \
< $< > $@ || rm $@
pc_verbose = $(pc_verbose_@AM_V@)
diff --git a/configure.ac b/configure.ac
index 119e437..951a385 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,8 +190,7 @@ case "$host_os" in
;;
esac
-requirement_elm_pc="\
- ${requirement_elm_pc} \
+requirement_elm_pc_only="\
efl >= efl_version \
eina >= efl_version \
eet >= efl_version \
@@ -214,6 +213,11 @@ requirement_elm_pc="\
eio >= efl_version \
"
+requirement_elm_pc="\
+ ${requirement_elm_pc} \
+ ${requirement_elm_pc_only} \
+ "
+
ELM_CHECK_BACKEND([X])
ELM_CHECK_BACKEND([FB])
ELM_CHECK_BACKEND([PSL1GHT])
@@ -230,6 +234,7 @@ ELM_CHECK_OPTION([emap], [0.1.0])
ELM_CHECK_OPTION([eweb])
PKG_CHECK_MODULES([ELEMENTARY], [${requirement_elm_pc}])
+PKG_CHECK_MODULES([ELEMENTARY_PC], [${requirement_elm_pc_only}])
EFL_ENABLE_EO_API_SUPPORT
EFL_ENABLE_BETA_API_SUPPORT
@@ -326,6 +331,7 @@ esac
AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"])
ELEMENTARY_LIBS="${ELEMENTARY_LIBS} ${requirement_elm_libs}"
+ELEMENTARY_PC_LIBS="${ELEMENTARY_PC_LIBS} ${requirement_elm_libs}"
AC_SUBST([requirement_elm_pc])
diff --git a/elementary-cxx.pc.in b/elementary-cxx.pc.in
index a85e0af..1478975 100644
--- a/elementary-cxx.pc.in
+++ b/elementary-cxx.pc.in
@@ -13,5 +13,5 @@ Name: elementary++
Description: Elementary C++ bindings
Requires.private: @requirement_elm_pc@
Version: @VERSION@
-Libs: -L${libdir} -lelementary @ELEMENTARY_LIBS@
+Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
Cflags: -I${includedir}/elementary-@VMAJ@ -I${includedir}/elementary-cxx-@VMAJ@
diff --git a/elementary.pc.in b/elementary.pc.in
index e24c259..aad3177 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -13,5 +13,5 @@ Name: elementary
Description: Mobile device touchscreen widget library
Requires.private: @requirement_elm_pc@
Version: @VERSION@
-Libs: -L${libdir} -lelementary @ELEMENTARY_LIBS@
+Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
Cflags: -I${includedir}/elementary-@VMAJ@
--
