efl: Fix parallel make

When creating the rules to build, we can't declare the lib dependencies in
LDADD/LIBADD using $(top_builddir)/libbla.la because automake doesn't know this
is related to the libbla_la rule.

Please check if evil works, too. Since I don't run evil code, it's untested.

SVN revision: 78800

diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index b6a198f..2a1907d 100644 (file)
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -42,10 +42,10 @@ lib_eet_libeet_la_CPPFLAGS += \
 -I$(top_builddir)/src/lib/evil
 endif
 
-lib_eet_libeet_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la
+lib_eet_libeet_la_LIBADD = lib/eina/libeina.la
 
 if HAVE_WINDOWS
-lib_eet_libeet_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
+lib_eet_libeet_la_LIBADD += lib/evil/libevil.la
 endif
 
 lib_eet_libeet_la_LIBADD += @EET_LIBS@ -lm
@@ -78,11 +78,11 @@ bin_eet_eet_CPPFLAGS += \
 endif
 
 bin_eet_eet_LDADD = \
-$(top_builddir)/src/lib/eet/libeet.la \
-$(top_builddir)/src/lib/eina/libeina.la
+lib/eet/libeet.la \
+lib/eina/libeina.la
 
 if HAVE_WINDOWS
-bin_eet_eet_LDADD += $(top_builddir)/src/lib/evil/libevil.la
+bin_eet_eet_LDADD += lib/evil/libevil.la
 endif
 
 bin_eet_eet_LDADD += @EET_LIBS@

diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 05bdd41..12acc28 100644 (file)
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -31,10 +31,10 @@ lib_embryo_libembryo_la_CPPFLAGS += \
 -I$(top_builddir)/src/lib/evil
 endif
 
-lib_embryo_libembryo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la
+lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la
 
 if HAVE_WINDOWS
-lib_embryo_libembryo_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la
+lib_embryo_libembryo_la_LIBADD += lib/evil/libevil.la
 endif
 
 lib_embryo_libembryo_la_LIBADD += -lm
@@ -78,11 +78,11 @@ bin_embryo_embryo_cc_CPPFLAGS += \
 endif
 
 bin_embryo_embryo_cc_LDADD = \
-$(top_builddir)/src/lib/embryo/libembryo.la \
-$(top_builddir)/src/lib/eina/libeina.la
+lib/embryo/libembryo.la \
+lib/eina/libeina.la
 
 if HAVE_WINDOWS
-bin_embryo_embryo_cc_LDADD += $(top_builddir)/src/lib/evil/libevil.la
+bin_embryo_embryo_cc_LDADD += lib/evil/libevil.la
 endif
 
 EXTRA_DIST += \

diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index cc3b250..6000066 100644 (file)
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -21,6 +21,6 @@ lib_eo_libeo_la_CPPFLAGS = \
 @EFL_CFLAGS@ \
 @EO_CFLAGS@
 
-lib_eo_libeo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EO_LIBS@
+lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@
 
 lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@

diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index eb263c0..cd5797d 100644 (file)
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -171,10 +171,10 @@ bin_evil_evil_suite_CPPFLAGS += \
 endif
 
 bin_evil_evil_suite_LDADD = \
-$(top_builddir)/src/lib/evil/libevil.la \
-$(top_builddir)/src/lib/eina/libdl.la \
+lib/evil/libevil.la \
+lib/eina/libdl.la \
 -lm
 
 bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
 
-bin_evil_test_evil_LDADD = $(top_builddir)/src/lib/evil/libevil.la
+bin_evil_test_evil_LDADD = lib/evil/libevil.la