Evil: Fix parallel build for Windows
authorJean-Philippe Andre <jp.andre@samsung.com>
Thu, 20 Feb 2014 08:49:43 +0000 (17:49 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Fri, 21 Feb 2014 01:18:48 +0000 (10:18 +0900)
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

src/Makefile_Evil.am

index 47e15b4..2626030 100644 (file)
@@ -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 += \