summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac96
-rw-r--r--m4/efl_check_funcs.m42
-rw-r--r--m4/efl_check_libs.m416
-rw-r--r--src/bin/eet/Makefile.am20
-rw-r--r--src/lib/eet/Makefile.am19
-rw-r--r--src/lib/eina/Makefile.am17
6 files changed, 126 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac
index b0ba6e4ace..d1bb640c61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,21 @@ requirements_libs_emotion=""
80requirements_libs_ethumb="" 80requirements_libs_ethumb=""
81requirements_libs_elementary="" 81requirements_libs_elementary=""
82 82
83requirements_libs_deps_evil=""
84requirements_libs_deps_eina=""
85requirements_libs_deps_eet=""
86requirements_libs_deps_evas=""
87requirements_libs_deps_ecore=""
88requirements_libs_deps_embryo=""
89requirements_libs_deps_eio=""
90requirements_libs_deps_edje=""
91requirements_libs_deps_efreet=""
92requirements_libs_deps_e_dbus=""
93requirements_libs_deps_eeze=""
94requirements_libs_deps_emotion=""
95requirements_libs_deps_ethumb=""
96requirements_libs_deps_elementary=""
97
83requirements_pc_eina="" 98requirements_pc_eina=""
84requirements_pc_eet="" 99requirements_pc_eet=""
85requirements_pc_evas="" 100requirements_pc_evas=""
@@ -94,6 +109,20 @@ requirements_pc_emotion=""
94requirements_pc_ethumb="" 109requirements_pc_ethumb=""
95requirements_pc_elementary="" 110requirements_pc_elementary=""
96 111
112requirements_pc_deps_eina=""
113requirements_pc_deps_eet=""
114requirements_pc_deps_evas=""
115requirements_pc_deps_ecore=""
116requirements_pc_deps_embryo=""
117requirements_pc_deps_eio=""
118requirements_pc_deps_edje=""
119requirements_pc_deps_efreet=""
120requirements_pc_deps_e_dbus=""
121requirements_pc_deps_eeze=""
122requirements_pc_deps_emotion=""
123requirements_pc_deps_ethumb=""
124requirements_pc_deps_elementary=""
125
97AC_SUBST([requirements_libs_evil]) 126AC_SUBST([requirements_libs_evil])
98AC_SUBST([requirements_libs_eina]) 127AC_SUBST([requirements_libs_eina])
99AC_SUBST([requirements_libs_eet]) 128AC_SUBST([requirements_libs_eet])
@@ -310,7 +339,7 @@ AC_CHECK_HEADERS([errno.h])
310 339
311EVIL_CPPFLAGS="-DEFL_EVIL_BUILD" 340EVIL_CPPFLAGS="-DEFL_EVIL_BUILD"
312EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1" 341EVIL_DLFCN_CPPFLAGS="-DEFL_EVIL_DLFCN_BUILD -DPSAPI_VERSION=1"
313EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -mms-bitfields" 342EVIL_CFLAGS="-Wall -Wextra -Wshadow -Wdeclaration-after-statement -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wpointer-arith -mms-bitfields"
314EVIL_CXXFLAGS="" 343EVIL_CXXFLAGS=""
315 344
316if test "x${have_win32}" = "xyes" ; then 345if test "x${have_win32}" = "xyes" ; then
@@ -457,6 +486,22 @@ AC_MSG_RESULT([${enable_benchmark_e17}])
457 486
458AM_CONDITIONAL([EINA_ENABLE_BENCHMARK_E17], [test "x${enable_benchmark_e17}" = "xyes"]) 487AM_CONDITIONAL([EINA_ENABLE_BENCHMARK_E17], [test "x${enable_benchmark_e17}" = "xyes"])
459 488
489# Valgrind
490
491AC_ARG_ENABLE([valgrind],
492 [AC_HELP_STRING([--enable-valgrind], [improve valgrind support by hinting it of our memory usages, having it to report proper mempool leaks. @<:@default=no@:>@])],
493 [
494 if test "x${enableval}" = "xyes" ; then
495 want_valgrind="yes"
496 else
497 want_valgrind="no"
498 fi
499 ],
500 [want_valgrind="no"])
501
502AC_MSG_CHECKING([whether to enable build with valgrind])
503AC_MSG_RESULT([${want_valgrind}])
504
460### Checks for programs 505### Checks for programs
461 506
462### Checks for libraries 507### Checks for libraries
@@ -468,7 +513,6 @@ AM_CONDITIONAL([EINA_ENABLE_BENCHMARK_E17], [test "x${enable_benchmark_e17}" = "
468EFL_EINA_BUILD="" 513EFL_EINA_BUILD=""
469case "$host_os" in 514case "$host_os" in
470 mingw*) 515 mingw*)
471 PKG_CHECK_EXISTS([evil >= 1.6.99])
472 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) 516 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
473 requirements_pc_eina="${requirements_pc_eina} evil" 517 requirements_pc_eina="${requirements_pc_eina} evil"
474 EFL_EINA_BUILD="-DEFL_EINA_BUILD" 518 EFL_EINA_BUILD="-DEFL_EINA_BUILD"
@@ -500,33 +544,16 @@ PKG_CHECK_EXISTS([exotic],
500AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"]) 544AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
501AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC]) 545AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC])
502 546
503if ! test "x${requirements_pc_eina}" = "x" ; then
504 PKG_CHECK_MODULES([EINA], [${requirements_pc_eina}])
505fi
506
507## Options 547## Options
508 548
509# Valgrind 549# Valgrind
510 550
511AC_ARG_ENABLE([valgrind],
512 [AC_HELP_STRING([--enable-valgrind], [improve valgrind support by hinting it of our memory usages, having it to report proper mempool leaks.])],
513 [
514 if test "x${enableval}" = "xyes" ; then
515 want_valgrind="yes"
516 else
517 want_valgrind="no"
518 fi
519 ],
520 [want_valgrind="auto"])
521
522AC_MSG_CHECKING([whether to enable build with valgrind])
523AC_MSG_RESULT([${want_valgrind}])
524
525if test "x${want_valgrind}" = "xyes" || test "x${want_valgrind}" = "xauto"; then 551if test "x${want_valgrind}" = "xyes" || test "x${want_valgrind}" = "xauto"; then
526 PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0], 552 PKG_CHECK_MODULES([VALGRIND], [valgrind >= 2.4.0],
527 [ 553 [
528 have_valgrind="yes" 554 have_valgrind="yes"
529 requirements_pc_eina="valgrind ${requirements_pc_eina}" 555 requirements_pc_eina="valgrind >= 2.4.0 ${requirements_pc_eina}"
556 requirements_pc_deps_eina="valgrind ${requirements_pc_deps_eina}"
530 ], 557 ],
531 [ 558 [
532 have_valgrind="no" 559 have_valgrind="no"
@@ -590,6 +617,12 @@ if test "x${enable_ememoa}" = "xyes" ; then
590 [enable_ememoa="no"]) 617 [enable_ememoa="no"])
591fi 618fi
592 619
620if ! test "x${requirements_pc_deps_eina}" = "x" ; then
621 PKG_CHECK_MODULES([EINA], [${requirements_pc_deps_eina}])
622fi
623
624
625
593## Examples 626## Examples
594 627
595PKG_CHECK_MODULES([ECORE_EVAS], 628PKG_CHECK_MODULES([ECORE_EVAS],
@@ -677,7 +710,7 @@ m4_ifdef([v_ver],
677 EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra]) 710 EFL_CHECK_COMPILER_FLAGS([EINA], [-Wall -Wextra])
678 ]) 711 ])
679 712
680EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow]) 713EFL_CHECK_COMPILER_FLAGS([EINA], [-Wshadow -Wpointer-arith])
681 714
682### Checks for linker characteristics 715### Checks for linker characteristics
683 716
@@ -854,7 +887,6 @@ AC_MSG_RESULT([${want_signature}])
854EFL_EET_BUILD="" 887EFL_EET_BUILD=""
855case "$host_os" in 888case "$host_os" in
856 mingw*) 889 mingw*)
857 PKG_CHECK_EXISTS([evil >= 1.1.0])
858 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) 890 AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
859 requirements_pc_eet="evil ${requirements_pc_eet}" 891 requirements_pc_eet="evil ${requirements_pc_eet}"
860 EFL_EET_BUILD="-DEFL_EET_BUILD" 892 EFL_EET_BUILD="-DEFL_EET_BUILD"
@@ -884,6 +916,7 @@ if test "x${want_gnutls}" = "xyes" || test "x${want_gnutls}" = "xauto" ; then
884 want_openssl="no" 916 want_openssl="no"
885 AC_DEFINE([HAVE_GNUTLS], [1], [Have Gnutls support]) 917 AC_DEFINE([HAVE_GNUTLS], [1], [Have Gnutls support])
886 requirements_pc_eet="gnutls >= 1.7.6 ${requirements_pc_eet}" 918 requirements_pc_eet="gnutls >= 1.7.6 ${requirements_pc_eet}"
919 requirements_pc_deps_eet="gnutls >= 1.7.6 ${requirements_pc_deps_eet}"
887 ], 920 ],
888 [have_gnutls="no"]) 921 [have_gnutls="no"])
889fi 922fi
@@ -894,6 +927,7 @@ if test "x${have_gnutls}" = "xyes" ; then
894 AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"]) 927 AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"])
895 if test "x${have_gnutls}" = "xyes" ; then 928 if test "x${have_gnutls}" = "xyes" ; then
896 requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}" 929 requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}"
930 requirements_libs_deps_eet="${LIBGCRYPT_LIBS} ${requirements_libs_deps_eet}"
897 fi 931 fi
898fi 932fi
899 933
@@ -977,6 +1011,7 @@ if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then
977 have_openssl="yes" 1011 have_openssl="yes"
978 AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support]) 1012 AC_DEFINE([HAVE_OPENSSL], [1], [Have Openssl support])
979 requirements_pc_eet="openssl ${requirements_pc_eet}" 1013 requirements_pc_eet="openssl ${requirements_pc_eet}"
1014 requirements_pc_deps_eet="openssl ${requirements_pc_deps_eet}"
980 ], 1015 ],
981 [have_openssl="no"]) 1016 [have_openssl="no"])
982fi 1017fi
@@ -1017,23 +1052,28 @@ AC_MSG_RESULT([${have_signature}])
1017 1052
1018# libjpeg and zlib 1053# libjpeg and zlib
1019 1054
1020EFL_CHECK_LIBS([eet], [libjpeg zlib]) 1055EFL_CHECK_LIBS([EET], [libjpeg zlib])
1021 1056
1022# Eina library 1057# Eina library
1023 1058
1024requirements_pc_eet="eina >= 1.2.0 ${requirements_pc_eet}" 1059requirements_pc_eet="eina >= 1.7.99 ${requirements_pc_eet}"
1025PKG_CHECK_MODULES([EET], [${requirements_pc_eet}]) 1060
1061PKG_CHECK_MODULES([EET], [${requirements_pc_deps_eet}])
1062
1063# Windows
1026 1064
1027case "$host_os" in 1065case "$host_os" in
1028 mingw32ce*) 1066 mingw32ce*)
1029 requirements_libs_eet="${requirements_libs_eet} -lws2" 1067 requirements_libs_eet="${requirements_libs_eet} -lws2"
1068 requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2"
1030 ;; 1069 ;;
1031 mingw*) 1070 mingw*)
1032 requirements_libs_eet="${requirements_libs_eet} -lws2_32" 1071 requirements_libs_eet="${requirements_libs_eet} -lws2_32"
1072 requirements_libs_deps_eet="${requirements_libs_deps_eet} -lws2_32"
1033 ;; 1073 ;;
1034esac 1074esac
1035 1075
1036EET_LIBS="${EET_LIBS} ${requirements_libs_eet}" 1076EET_LIBS="${EET_LIBS} ${requirements_libs_deps_eet}"
1037 1077
1038### Checks for header files 1078### Checks for header files
1039 1079
@@ -1069,6 +1109,8 @@ if test ! "x${have_null}" = "xyes" ; then
1069 AC_MSG_WARN([Your system is a bit too funny, eet might not work properly]) 1109 AC_MSG_WARN([Your system is a bit too funny, eet might not work properly])
1070fi 1110fi
1071 1111
1112EFL_CHECK_COMPILER_FLAGS([EET], [-Wshadow -Wpointer-arith])
1113
1072### Checks for linker characteristics 1114### Checks for linker characteristics
1073 1115
1074case "${host_os}" in 1116case "${host_os}" in
diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4
index d72fb34344..1611633a15 100644
--- a/m4/efl_check_funcs.m4
+++ b/m4/efl_check_funcs.m4
@@ -85,7 +85,6 @@ case "$host_os" in
85 mingw*) 85 mingw*)
86 _efl_have_fct="yes" 86 _efl_have_fct="yes"
87 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" 87 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl"
88 m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -ldl"
89 ;; 88 ;;
90 *) 89 *)
91 _efl_have_fct="no" 90 _efl_have_fct="no"
@@ -151,7 +150,6 @@ case "$host_os" in
151 mingw*) 150 mingw*)
152 _efl_have_fct="yes" 151 _efl_have_fct="yes"
153 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl" 152 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl"
154 m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -ldl"
155 ;; 153 ;;
156 *) 154 *)
157 _efl_have_fct="no" 155 _efl_have_fct="no"
diff --git a/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4
index b1c37894b6..cbdb11b795 100644
--- a/m4/efl_check_libs.m4
+++ b/m4/efl_check_libs.m4
@@ -26,6 +26,7 @@ if test "x${have_dep}" = "xyes" ; then
26 [ 26 [
27 have_dep="yes" 27 have_dep="yes"
28 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg" 28 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg"
29 requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -ljpeg"
29 ], 30 ],
30 [ 31 [
31 AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file") 32 AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file")
@@ -47,16 +48,12 @@ AC_DEFUN([_EFL_CHECK_LIB_ZLIB],
47m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl 48m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
48m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl 49m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
49 50
50PKG_CHECK_EXISTS([zlib], 51PKG_CHECK_EXISTS([zlib >= 1.2.3], [_efl_have_lib="yes"], [_efl_have_lib="no"])
51 [
52 _efl_have_lib="yes"
53 requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib"
54 ],
55 [
56 _efl_have_lib="no"
57 ])
58 52
59if test "x${_efl_have_lib}" = "xno" ; then 53if test "x${_efl_have_lib}" = "xyes" ; then
54 requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib >= 1.2.3"
55 requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[]m4_defn([DOWNEFL])} zlib >= 1.2.3"
56else
60 AC_CHECK_HEADER([zlib.h], 57 AC_CHECK_HEADER([zlib.h],
61 [_efl_have_lib="yes"], 58 [_efl_have_lib="yes"],
62 [ 59 [
@@ -69,6 +66,7 @@ if test "x${_efl_have_lib}" = "xno" ; then
69 [ 66 [
70 _efl_have_lib="yes" 67 _efl_have_lib="yes"
71 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz" 68 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz"
69 requirements_libs_deps_[]m4_defn([DOWNEFL])="${requirements_libs_deps_[]m4_defn([DOWNEFL])} -lz"
72 ], 70 ],
73 [ 71 [
74 AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"]) 72 AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"])
diff --git a/src/bin/eet/Makefile.am b/src/bin/eet/Makefile.am
index af5fa844c8..eb536c4514 100644
--- a/src/bin/eet/Makefile.am
+++ b/src/bin/eet/Makefile.am
@@ -1,17 +1,33 @@
1
2MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
3 2
4AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/include/eina \
5-I$(top_srcdir)/src/lib/eet \ 5-I$(top_srcdir)/src/lib/eet \
6-I$(top_builddir)/src/include/eina \
6-I$(top_builddir)/src/lib/eet \ 7-I$(top_builddir)/src/lib/eet \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 8-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 9-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@EET_CFLAGS@ 11@EET_CFLAGS@
11 12
13if HAVE_WINDOWS
14AM_CPPFLAGS += \
15-I$(top_srcdir)/src/lib/evil \
16-I$(top_builddir)/src/lib/evil
17endif
18
12bin_PROGRAMS = @EET_PRG@ 19bin_PROGRAMS = @EET_PRG@
13EXTRA_PROGRAMS = eet 20EXTRA_PROGRAMS = eet
14 21
15eet_SOURCES = eet_main.c 22eet_SOURCES = eet_main.c
16eet_LDADD = $(top_builddir)/src/lib/eet/libeet.la @EET_LIBS@ 23eet_LDADD = \
24$(top_builddir)/src/lib/eet/libeet.la \
25$(top_builddir)/src/lib/eina/libeina.la
26
27if HAVE_WINDOWS
28eet_LDADD += $(top_builddir)/src/lib/evil/libdl.la
29endif
30
31eet_LDADD += @EET_LIBS@
32
17eet_LDFLAGS = @lt_enable_auto_import@ 33eet_LDFLAGS = @lt_enable_auto_import@
diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
index e4d1c3b823..9460528da9 100644
--- a/src/lib/eet/Makefile.am
+++ b/src/lib/eet/Makefile.am
@@ -1,10 +1,10 @@
1
2MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
3 2
4AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
5-I. \ 4-I$(top_srcdir)/src/include/eina \
6-I$(top_srcdir)/src/lib/eet \ 5-I$(top_srcdir)/src/lib/eet \
7-I$(top_srcdir)/src/lib/eet/lz4 \ 6-I$(top_srcdir)/src/lib/eet/lz4 \
7-I$(top_builddir)/src/include/eina \
8-I$(top_builddir)/src/lib/eet \ 8-I$(top_builddir)/src/lib/eet \
9-I$(top_builddir)/src/lib/eet/lz4 \ 9-I$(top_builddir)/src/lib/eet/lz4 \
10-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -13,6 +13,12 @@ AM_CPPFLAGS = \
13@EET_CFLAGS@ \ 13@EET_CFLAGS@ \
14@EFL_EET_BUILD@ 14@EFL_EET_BUILD@
15 15
16if HAVE_WINDOWS
17AM_CPPFLAGS += \
18-I$(top_srcdir)/src/lib/evil \
19-I$(top_builddir)/src/lib/evil
20endif
21
16includes_HEADERS = Eet.h 22includes_HEADERS = Eet.h
17includesdir = $(includedir)/eet-@VMAJ@ 23includesdir = $(includedir)/eet-@VMAJ@
18 24
@@ -34,7 +40,14 @@ lz4/lz4.h \
34lz4/lz4hc.c \ 40lz4/lz4hc.c \
35lz4/lz4hc.h 41lz4/lz4hc.h
36 42
37libeet_la_LIBADD = @EET_LIBS@ -lm 43libeet_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la
44
45if HAVE_WINDOWS
46libeet_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
47endif
48
49libeet_la_LIBADD += @EET_LIBS@ -lm
50
38libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 51libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
39 52
40EXTRA_DIST = lz4/README 53EXTRA_DIST = lz4/README
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
index 7b1901238f..747eda8617 100644
--- a/src/lib/eina/Makefile.am
+++ b/src/lib/eina/Makefile.am
@@ -11,6 +11,12 @@ AM_CPPFLAGS = \
11@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
12@VALGRIND_CFLAGS@ 12@VALGRIND_CFLAGS@
13 13
14if HAVE_WINDOWS
15AM_CPPFLAGS += \
16-I$(top_srcdir)/src/lib/evil \
17-I$(top_builddir)/src/lib/evil
18endif
19
14lib_LTLIBRARIES = libeina.la 20lib_LTLIBRARIES = libeina.la
15 21
16libeina_la_SOURCES = \ 22libeina_la_SOURCES = \
@@ -104,7 +110,16 @@ if EINA_STATIC_BUILD_PASS_THROUGH
104libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/pass_through/eina_pass_through.c 110libeina_la_SOURCES += $(top_srcdir)/src/modules/eina/mp/pass_through/eina_pass_through.c
105endif 111endif
106 112
107libeina_la_LIBADD = @EINA_LIBS@ -lm 113libeina_la_LIBADD = @EINA_LIBS@
114
115if HAVE_WINDOWS
116libeina_la_LIBADD += \
117$(top_builddir)/src/lib/evil/libevil.la \
118$(top_builddir)/src/lib/evil/libdl.la
119endif
120
121libeina_la_LIBADD += -lm
122
108libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ 123libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
109 124
110clean-local: 125clean-local: