aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Eet.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_Eet.am
parentefl: forgotten evas commit. (diff)
downloadefl-df1b3d30c4ca130fcecce67b2c0fcbbbcfa5a29c.tar.gz
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_Eet.am')
-rw-r--r--src/Makefile_Eet.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index b860da7a88..7c604646a8 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -31,7 +31,6 @@ lib_eet_libeet_la_CPPFLAGS = \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
-DEFL_EET_BUILD \
-@EFL_CFLAGS@ \
@EFL_COV_CFLAGS@ \
@EET_CFLAGS@ \
@USE_EVIL_CFLAGS@
@@ -59,7 +58,6 @@ bin_eet_eet_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EFL_CFLAGS@ \
@EFL_COV_CFLAGS@ \
@EET_CFLAGS@ \
@USE_EVIL_CFLAGS@
@@ -68,7 +66,7 @@ bin_eet_eet_LDADD = \
lib/eet/libeet.la \
lib/eina/libeina.la \
@USE_EVIL_LIBS@ \
-@EET_LIBS@ \
+@EET_LDFLAGS@ \
@EFL_COV_LIBS@
### Unit tests
@@ -95,7 +93,7 @@ tests_eet_eet_suite_LDADD = \
lib/eet/libeet.la \
lib/eina/libeina.la \
@CHECK_LIBS@ \
-@EET_LIBS@
+@EET_LDFLAGS@
endif