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.

diff --git a/Makefile.am b/Makefile.am
index e85ba36c1e4a75a31e441374cf7226fb4d64c725..70f7a92faa049777b1e984e825344f63b616ae91 100644 (file)
--- 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 119e4375d29bac6b5f4cb9ba1f0dae5b46f16947..951a38577992af04ffbc4b7a7d87a1d7d5ca7dc0 100644 (file)
--- 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 a85e0aff9c4bab58034a57d49a0daf97d582c6b2..14789751b62cec1c938e8c7ae7cd7cc9c5bd4c2e 100644 (file)
--- 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 e24c2591207822a7c06b85182b0832a24b93f370..aad317782ce49a44b41b757799e651d822e88a45 100644 (file)
--- 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@