diff options
author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2012-12-20 19:25:51 +0000 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2012-12-20 19:25:51 +0000 |
commit | b57e46b9b9e36367d9847516f8af6a0807b24b85 (patch) | |
tree | 703486d06a5f46131a2bda8801cf297039e9b86f /src/Makefile_Ecore_Con.am | |
parent | 5149aa925fefc8a80ba07968572bb9bedb79f3bf (diff) |
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_Ecore_Con.am')
-rw-r--r-- | src/Makefile_Ecore_Con.am | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index 5ef183c..df18c90 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am | |||
@@ -43,22 +43,15 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \ | |||
43 | -DEFL_ECORE_CON_BUILD \ | 43 | -DEFL_ECORE_CON_BUILD \ |
44 | @EFL_CFLAGS@ \ | 44 | @EFL_CFLAGS@ \ |
45 | @EFL_COV_CFLAGS@ \ | 45 | @EFL_COV_CFLAGS@ \ |
46 | @ECORE_CON_CFLAGS@ | 46 | @ECORE_CON_CFLAGS@ \ |
47 | 47 | @USE_EVIL_CFLAGS@ | |
48 | if HAVE_WINDOWS | ||
49 | lib_ecore_con_libecore_con_la_CPPFLAGS += \ | ||
50 | -I$(top_srcdir)/src/lib/evil | ||
51 | endif | ||
52 | 48 | ||
53 | lib_ecore_con_libecore_con_la_LIBADD = \ | 49 | lib_ecore_con_libecore_con_la_LIBADD = \ |
54 | lib/ecore/libecore.la \ | 50 | lib/ecore/libecore.la \ |
55 | lib/eet/libeet.la \ | 51 | lib/eet/libeet.la \ |
56 | lib/eo/libeo.la \ | 52 | lib/eo/libeo.la \ |
57 | lib/eina/libeina.la | 53 | lib/eina/libeina.la \ |
58 | 54 | @USE_EVIL_LIBS@ | |
59 | if HAVE_WINDOWS | ||
60 | lib_ecore_con_libecore_con_la_LIBADD += lib/evil/libevil.la | ||
61 | endif | ||
62 | 55 | ||
63 | lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm | 56 | lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm |
64 | 57 | ||