summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac26
-rw-r--r--doc/widgets/Makefile.am3
-rw-r--r--elementary.pc.in4
-rw-r--r--m4/elm_check_backend.m42
-rw-r--r--m4/elm_check_option.m44
-rw-r--r--src/bin/Makefile.am15
-rw-r--r--src/examples/Makefile.am1
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/tests/Makefile.am6
9 files changed, 26 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac
index 2d2514752..dbcf406a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,16 +185,16 @@ EFL_ENABLE_BIN([elementary-config])
### Checks for libraries
-requirement_elm=""
+requirement_elm_pc=""
case "$host_os" in
mingw*)
- requirement_elm="evil >= efl_version"
+ requirement_elm_pc="evil >= efl_version"
;;
esac
-requirement_elm="\
- ${requirement_elm} \
+requirement_elm_pc="\
+ ${requirement_elm_pc} \
efl >= efl_version \
eina >= efl_version \
eet >= efl_version \
@@ -232,8 +232,7 @@ ELM_CHECK_OPTION([eweather], [0.2.0])
ELM_CHECK_OPTION([emap], [0.1.0])
ELM_CHECK_OPTION([eweb])
-PKG_CHECK_MODULES([ELEMENTARY],
- [${requirement_elm}])
+PKG_CHECK_MODULES([ELEMENTARY], [${requirement_elm_pc}])
EFL_ENABLE_EO_API_SUPPORT
EFL_ENABLE_BETA_API_SUPPORT
@@ -247,7 +246,7 @@ if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then
evas-cxx >= efl_version
],
[
- requirement_elm="${requirement_elm} \
+ requirement_elm_pc="${requirement_elm_pc} \
eo-cxx >= efl_version \
eina-cxx >= efl_version \
evas-cxx >= efl_version \
@@ -273,7 +272,7 @@ AC_DEFINE_UNQUOTED([MODULE_EDJE], ["$MODULE_EDJE"], ["Edje module architecture"]
DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje ecore efl`
AC_SUBST([DEPS_EOLIAN_FLAGS])
-my_libs="-lm"
+requirement_elm_libs="-lm"
# sockets
@@ -285,7 +284,7 @@ case "$host_os" in
AC_CHECK_LIB([socket], [connect],
[
have_socket="yes"
- my_libs="-lsocket ${my_libs}"
+ requirement_elm_libs="-lsocket ${requirement_elm_libs}"
],
[have_socket="no"])
;;
@@ -307,7 +306,7 @@ case "$host_os" in
dnl managed by evil
AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.])
have_dlopen="yes"
- my_libs="-ldl ${my_libs}"
+ requirement_elm_libs="-ldl ${requirement_elm_libs}"
;;
*solaris*)
have_dlopen="yes"
@@ -319,7 +318,7 @@ dnl managed by evil
AC_CHECK_LIB([dl], [dlopen], [res=yes], [res=no])
if test "x$res" = "xyes"; then
AC_CHECK_LIB([dl], [dladdr], AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.]))
- my_libs="-ldl ${my_libs}"
+ requirement_elm_libs="-ldl ${requirement_elm_libs}"
have_dlopen="yes"
fi
;;
@@ -327,8 +326,9 @@ esac
AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"])
-AC_SUBST([my_libs])
-AC_SUBST([requirement_elm])
+ELEMENTARY_LIBS="${ELEMENTARY_LIBS} ${requirement_elm_libs}"
+
+AC_SUBST([requirement_elm_pc])
# check unit testing library
if test "${build_tests}" = "regular"; then
diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index a53024e1d..5cc58f39e 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -97,8 +97,7 @@ widget_preview_web \
widget_preview_win
LDADD = $(top_builddir)/src/lib/libelementary.la \
-@ELEMENTARY_LIBS@ \
-@my_libs@
+@ELEMENTARY_LIBS@
endif
diff --git a/elementary.pc.in b/elementary.pc.in
index 4288f20f1..1772c1330 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -11,7 +11,7 @@ eolian_flags=-I${eoincludedir}/elementary-@VMAJ@
Name: elementary
Description: Mobile device touchscreen widget library
-Requires.private: @requirement_elm@
+Requires.private: @requirement_elm_pc@
Version: @VERSION@
-Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@
+Libs: -L${libdir} -lelementary @ELEMENTARY_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@
Cflags: -I${includedir}/elementary-@VMAJ@
diff --git a/m4/elm_check_backend.m4 b/m4/elm_check_backend.m4
index 476f60924..471218f90 100644
--- a/m4/elm_check_backend.m4
+++ b/m4/elm_check_backend.m4
@@ -20,7 +20,7 @@ if test "x${want_backend}" != "xno"; then
[
AC_DEFINE([HAVE_ELEMENTARY_]UP, [1], [$1 support for Elementary])
have_elementary_[]DOWN="yes"
- requirement_elm="ecore-[]DOWN >= efl_version ${requirement_elm}"
+ requirement_elm_pc="ecore-[]DOWN >= efl_version ${requirement_elm_pc}"
],
[have_elementary_]DOWN[="no"]
)
diff --git a/m4/elm_check_option.m4 b/m4/elm_check_option.m4
index abad0f167..7690d0ca6 100644
--- a/m4/elm_check_option.m4
+++ b/m4/elm_check_option.m4
@@ -23,7 +23,7 @@ if test "x${want_option}" != "xno"; then
AC_DEFINE([HAVE_ELEMENTARY_]UP, [1], [$1 support for Elementary])
have_elementary_[]DOWN="yes"
ELM_[]UP[]_DEF="#define"
- requirement_elm="[]DOWN >= $2 ${requirement_elm}"
+ requirement_elm_pc="[]DOWN >= $2 ${requirement_elm_pc}"
],
[have_elementary_]DOWN[="no"]
)
@@ -83,7 +83,7 @@ if test "x${want_elementary_web}" != "xnone"; then
["WebKit's data dir"])
ELM_WEB2_DEF="#define"
elementary_web=${want_elementary_web}
- requirement_elm="${want_elementary_web} ${requirement_elm}"
+ requirement_elm_pc="${want_elementary_web} ${requirement_elm_pc}"
],
[elementary_web="no"]
)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 279002382..a736b59a9 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -129,8 +129,7 @@ test_win_dialog.c \
test.h
elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
- @ELEMENTARY_LIBS@ \
- @my_libs@
+ @ELEMENTARY_LIBS@
elementary_test_CFLAGS =
elementary_test_LDFLAGS =
@@ -138,8 +137,7 @@ elementary_config_SOURCES = \
config.c
elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
- @ELEMENTARY_LIBS@ \
- @my_libs@
+ @ELEMENTARY_LIBS@
elementary_config_LDFLAGS =
elementary_codegen_SOURCES = \
@@ -147,8 +145,7 @@ elementary_codegen.c
elementary_codegen_LDADD = \
$(top_builddir)/src/lib/libelementary.la \
- @ELEMENTARY_LIBS@ \
- @my_libs@
+ @ELEMENTARY_LIBS@
elementary_codegen_LDFLAGS =
noinst_HEADERS = \
@@ -163,14 +160,12 @@ elm_prefs_cc_handlers.c
elm_prefs_cc_LDADD = \
$(top_builddir)/src/lib/libelementary.la \
-@ELEMENTARY_LIBS@ \
-@my_libs@
+@ELEMENTARY_LIBS@
if BUILD_QUICKLAUNCH
elementary_quicklaunch_SOURCES = quicklaunch.c
elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
- @ELEMENTARY_LIBS@ \
- @my_libs@
+ @ELEMENTARY_LIBS@
elementary_quicklaunch_LDFLAGS =
if BUILD_RUN
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index be1d432f1..3edf636cd 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_CFLAGS@
LDADD = \
--lm \
@ELEMENTARY_LIBS@ \
$(top_builddir)/src/lib/libelementary.la
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a676d9f23..6706a4d5d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -499,7 +499,6 @@ elu_ews_wm.c
libelementary_la_CFLAGS =
libelementary_la_LIBADD = \
-@my_libs@ \
@ELEMENTARY_LIBS@ \
@LTLIBINTL@
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1597c4706..185669c7a 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -84,8 +84,7 @@ elm_suite_CPPFLAGS = \
elm_suite_LDADD = \
$(top_builddir)/src/lib/libelementary.la \
@CHECK_LIBS@ \
- @ELEMENTARY_LIBS@ \
- @my_libs@
+ @ELEMENTARY_LIBS@
if HAVE_CXX11
TESTS += elm_cxx_suite
@@ -103,6 +102,5 @@ elm_cxx_suite_CPPFLAGS = \
elm_cxx_suite_LDADD = \
$(top_builddir)/src/lib/libelementary.la \
@CHECK_LIBS@ \
- @ELEMENTARY_LIBS@ \
- @my_libs@
+ @ELEMENTARY_LIBS@
endif
View Lorry Controller Status