summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac10
-rw-r--r--elementary-cxx.pc.in2
-rw-r--r--elementary.pc.in2
4 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index e85ba36c1..70f7a92fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,7 @@ $(SED) \
86-e 's,@pkgdatadir\@,$(pkgdatadir),g' \ 86-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
87-e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \ 87-e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \
88-e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \ 88-e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \
89-e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \
89< $< > $@ || rm $@ 90< $< > $@ || rm $@
90 91
91pc_verbose = $(pc_verbose_@AM_V@) 92pc_verbose = $(pc_verbose_@AM_V@)
diff --git a/configure.ac b/configure.ac
index 119e4375d..951a38577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,8 +190,7 @@ case "$host_os" in
190 ;; 190 ;;
191esac 191esac
192 192
193requirement_elm_pc="\ 193requirement_elm_pc_only="\
194 ${requirement_elm_pc} \
195 efl >= efl_version \ 194 efl >= efl_version \
196 eina >= efl_version \ 195 eina >= efl_version \
197 eet >= efl_version \ 196 eet >= efl_version \
@@ -214,6 +213,11 @@ requirement_elm_pc="\
214 eio >= efl_version \ 213 eio >= efl_version \
215 " 214 "
216 215
216requirement_elm_pc="\
217 ${requirement_elm_pc} \
218 ${requirement_elm_pc_only} \
219 "
220
217ELM_CHECK_BACKEND([X]) 221ELM_CHECK_BACKEND([X])
218ELM_CHECK_BACKEND([FB]) 222ELM_CHECK_BACKEND([FB])
219ELM_CHECK_BACKEND([PSL1GHT]) 223ELM_CHECK_BACKEND([PSL1GHT])
@@ -230,6 +234,7 @@ ELM_CHECK_OPTION([emap], [0.1.0])
230ELM_CHECK_OPTION([eweb]) 234ELM_CHECK_OPTION([eweb])
231 235
232PKG_CHECK_MODULES([ELEMENTARY], [${requirement_elm_pc}]) 236PKG_CHECK_MODULES([ELEMENTARY], [${requirement_elm_pc}])
237PKG_CHECK_MODULES([ELEMENTARY_PC], [${requirement_elm_pc_only}])
233 238
234EFL_ENABLE_EO_API_SUPPORT 239EFL_ENABLE_EO_API_SUPPORT
235EFL_ENABLE_BETA_API_SUPPORT 240EFL_ENABLE_BETA_API_SUPPORT
@@ -326,6 +331,7 @@ esac
326AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) 331AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"])
327 332
328ELEMENTARY_LIBS="${ELEMENTARY_LIBS} ${requirement_elm_libs}" 333ELEMENTARY_LIBS="${ELEMENTARY_LIBS} ${requirement_elm_libs}"
334ELEMENTARY_PC_LIBS="${ELEMENTARY_PC_LIBS} ${requirement_elm_libs}"
329 335
330AC_SUBST([requirement_elm_pc]) 336AC_SUBST([requirement_elm_pc])
331 337
diff --git a/elementary-cxx.pc.in b/elementary-cxx.pc.in
index a85e0aff9..14789751b 100644
--- a/elementary-cxx.pc.in
+++ b/elementary-cxx.pc.in
@@ -13,5 +13,5 @@ Name: elementary++
13Description: Elementary C++ bindings 13Description: Elementary C++ bindings
14Requires.private: @requirement_elm_pc@ 14Requires.private: @requirement_elm_pc@
15Version: @VERSION@ 15Version: @VERSION@
16Libs: -L${libdir} -lelementary @ELEMENTARY_LIBS@ 16Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
17Cflags: -I${includedir}/elementary-@VMAJ@ -I${includedir}/elementary-cxx-@VMAJ@ 17Cflags: -I${includedir}/elementary-@VMAJ@ -I${includedir}/elementary-cxx-@VMAJ@
diff --git a/elementary.pc.in b/elementary.pc.in
index e24c25912..aad317782 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -13,5 +13,5 @@ Name: elementary
13Description: Mobile device touchscreen widget library 13Description: Mobile device touchscreen widget library
14Requires.private: @requirement_elm_pc@ 14Requires.private: @requirement_elm_pc@
15Version: @VERSION@ 15Version: @VERSION@
16Libs: -L${libdir} -lelementary @ELEMENTARY_LIBS@ 16Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
17Cflags: -I${includedir}/elementary-@VMAJ@ 17Cflags: -I${includedir}/elementary-@VMAJ@