summaryrefslogtreecommitdiff
path: root/src/Makefile_Embryo.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-31 00:46:14 +0000
commitdf1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c (patch)
treee26086071ac285910d3e162c39819f3a2c3affea /src/Makefile_Embryo.am
parent51f8fe26fc4774e69be3547d49ae902c287c8b61 (diff)
efl: refactor CFLAGS, LIBS, LIBADD and LDADD usage.
- remove EFL_LIBS and EFL_CFLAGS, use per-lib values that inherit from EFL (general) - add NAME_LDFLAGS and EFL_LDFLAGS for linker flags. - LDADD (binaries) now use NAME_LDFLAGS instead of NAME_LIBS, as they link to libname.la and that will pull in the libtool dependencies SVN revision: 81915
Diffstat (limited to 'src/Makefile_Embryo.am')
-rw-r--r--src/Makefile_Embryo.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index d8452f7..f5bb307 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -24,7 +24,6 @@ lib_embryo_libembryo_la_CPPFLAGS = \
24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
25-DEFL_EMBRYO_BUILD \ 25-DEFL_EMBRYO_BUILD \
26@EMBRYO_CFLAGS@ \ 26@EMBRYO_CFLAGS@ \
27@EFL_CFLAGS@ \
28@USE_EVIL_CFLAGS@ 27@USE_EVIL_CFLAGS@
29 28
30lib_embryo_libembryo_la_LIBADD = \ 29lib_embryo_libembryo_la_LIBADD = \
@@ -61,13 +60,13 @@ bin_embryo_embryo_cc_CPPFLAGS = \
61-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 60-DPACKAGE_BIN_DIR=\"$(bindir)\" \
62-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 61-DPACKAGE_LIB_DIR=\"$(libdir)\" \
63-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 62-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
64@EFL_CFLAGS@ \
65@EMBRYO_CFLAGS@ \ 63@EMBRYO_CFLAGS@ \
66@USE_EVIL_CFLAGS@ 64@USE_EVIL_CFLAGS@
67 65
68bin_embryo_embryo_cc_LDADD = \ 66bin_embryo_embryo_cc_LDADD = \
69lib/embryo/libembryo.la \ 67lib/embryo/libembryo.la \
70lib/eina/libeina.la \ 68lib/eina/libeina.la \
69@EMBRYO_LDFLAGS@ \
71@USE_EVIL_LIBS@ 70@USE_EVIL_LIBS@
72 71
73EXTRA_DIST += \ 72EXTRA_DIST += \