aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-02-20 17:49:43 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-02-21 10:18:48 +0900
commit40b02730a3dac4b51c05e538f5d0555b23a641df (patch)
tree198f2409d212251e75be301c80288d243e263748 /src
parentecore_evas_fb: allow to force tslib even if mouse was handled. (diff)
downloadefl-40b02730a3dac4b51c05e538f5d0555b23a641df.tar.gz
Evil: Fix parallel build for Windows
Add some internal dependencies when building Evil stuff: The two binaries test_evil and evil_suite need libdl and libevil. This should fix "make -j8" Tested with using mingw64 cross compilation
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Evil.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 47e15b4b31..26260302f8 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -97,10 +97,9 @@ lib_evil_libdl_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
@EVIL_CFLAGS@ \
@EVIL_DLFCN_CPPFLAGS@
-lib_evil_libdl_la_LIBADD = \
-@USE_EVIL_LIBS@ \
-@EVIL_DLFCN_LIBS@
+lib_evil_libdl_la_LIBADD = @USE_EVIL_LIBS@ @EVIL_DLFCN_LIBS@
lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+lib_evil_libdl_la_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
### Binary
@@ -138,9 +137,11 @@ endif
bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@
bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm
+bin_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@
bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
bin_evil_test_evil_LDADD = @USE_EVIL_LIBS@
+bin_evil_test_evil_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@
endif
EXTRA_DIST += \