aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Eet.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-20 19:25:51 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-20 19:25:51 +0000
commitb57e46b9b9e36367d9847516f8af6a0807b24b85 (patch)
tree703486d06a5f46131a2bda8801cf297039e9b86f /src/Makefile_Eet.am
parentefl/struct dirent: remove check as nobody use the results. (diff)
downloadefl-b57e46b9b9e36367d9847516f8af6a0807b24b85.tar.gz
efl: simplify linkage/usage of evil on windows.
instead of spreading it all around, just define 2 AC_SUBST() that will do the work. SVN revision: 81477
Diffstat (limited to 'src/Makefile_Eet.am')
-rw-r--r--src/Makefile_Eet.am40
1 files changed, 14 insertions, 26 deletions
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 4377c87461..7c7e8beca5 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -33,20 +33,15 @@ lib_eet_libeet_la_CPPFLAGS = \
-DEFL_EET_BUILD \
@EFL_CFLAGS@ \
@EFL_COV_CFLAGS@ \
-@EET_CFLAGS@
-
-if HAVE_WINDOWS
-lib_eet_libeet_la_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil
-endif
-
-lib_eet_libeet_la_LIBADD = lib/eina/libeina.la
+@EET_CFLAGS@ \
+@USE_EVIL_CFLAGS@
-if HAVE_WINDOWS
-lib_eet_libeet_la_LIBADD += lib/evil/libevil.la
-endif
-
-lib_eet_libeet_la_LIBADD += @EET_LIBS@ @EFL_COV_LIBS@ -lm
+lib_eet_libeet_la_LIBADD = \
+lib/eina/libeina.la \
+@USE_EVIL_LIBS@ \
+@EET_LIBS@ \
+@EFL_COV_LIBS@ \
+-lm
lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
@@ -67,22 +62,15 @@ bin_eet_eet_CPPFLAGS = \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@EFL_CFLAGS@ \
@EFL_COV_CFLAGS@ \
-@EET_CFLAGS@
-
-if HAVE_WINDOWS
-bin_eet_eet_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil
-endif
+@EET_CFLAGS@ \
+@USE_EVIL_CFLAGS@
bin_eet_eet_LDADD = \
lib/eet/libeet.la \
-lib/eina/libeina.la
-
-if HAVE_WINDOWS
-bin_eet_eet_LDADD += lib/evil/libevil.la
-endif
-
-bin_eet_eet_LDADD += @EET_LIBS@ @EFL_COV_LIBS@
+lib/eina/libeina.la \
+@USE_EVIL_LIBS@ \
+@EET_LIBS@ \
+@EFL_COV_LIBS@
### Unit tests