diff options
author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-11-01 16:35:29 +0000 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-11-01 16:35:29 +0000 |
commit | 71ab3d6a17f0a5026a0e2815150a2471dc426a66 (patch) | |
tree | 8770099221ca34a87c914767567b4d50a738e7fb /src | |
parent | 58a9a0ad574c417bbe56043f151fc91ceba78822 (diff) |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile_Eet.am | 10 | ||||
-rw-r--r-- | src/Makefile_Embryo.am | 10 | ||||
-rw-r--r-- | src/Makefile_Eo.am | 2 | ||||
-rw-r--r-- | src/Makefile_Evil.am | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am index b6a198f626..2a1907d5a4 100644 --- a/src/Makefile_Eet.am +++ b/src/Makefile_Eet.am | |||
@@ -42,10 +42,10 @@ lib_eet_libeet_la_CPPFLAGS += \ | |||
42 | -I$(top_builddir)/src/lib/evil | 42 | -I$(top_builddir)/src/lib/evil |
43 | endif | 43 | endif |
44 | 44 | ||
45 | lib_eet_libeet_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la | 45 | lib_eet_libeet_la_LIBADD = lib/eina/libeina.la |
46 | 46 | ||
47 | if HAVE_WINDOWS | 47 | if HAVE_WINDOWS |
48 | lib_eet_libeet_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la | 48 | lib_eet_libeet_la_LIBADD += lib/evil/libevil.la |
49 | endif | 49 | endif |
50 | 50 | ||
51 | lib_eet_libeet_la_LIBADD += @EET_LIBS@ -lm | 51 | lib_eet_libeet_la_LIBADD += @EET_LIBS@ -lm |
@@ -78,11 +78,11 @@ bin_eet_eet_CPPFLAGS += \ | |||
78 | endif | 78 | endif |
79 | 79 | ||
80 | bin_eet_eet_LDADD = \ | 80 | bin_eet_eet_LDADD = \ |
81 | $(top_builddir)/src/lib/eet/libeet.la \ | 81 | lib/eet/libeet.la \ |
82 | $(top_builddir)/src/lib/eina/libeina.la | 82 | lib/eina/libeina.la |
83 | 83 | ||
84 | if HAVE_WINDOWS | 84 | if HAVE_WINDOWS |
85 | bin_eet_eet_LDADD += $(top_builddir)/src/lib/evil/libevil.la | 85 | bin_eet_eet_LDADD += lib/evil/libevil.la |
86 | endif | 86 | endif |
87 | 87 | ||
88 | bin_eet_eet_LDADD += @EET_LIBS@ | 88 | bin_eet_eet_LDADD += @EET_LIBS@ |
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am index 05bdd417c5..12acc28b98 100644 --- a/src/Makefile_Embryo.am +++ b/src/Makefile_Embryo.am | |||
@@ -31,10 +31,10 @@ lib_embryo_libembryo_la_CPPFLAGS += \ | |||
31 | -I$(top_builddir)/src/lib/evil | 31 | -I$(top_builddir)/src/lib/evil |
32 | endif | 32 | endif |
33 | 33 | ||
34 | lib_embryo_libembryo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la | 34 | lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la |
35 | 35 | ||
36 | if HAVE_WINDOWS | 36 | if HAVE_WINDOWS |
37 | lib_embryo_libembryo_la_LIBADD += $(top_builddir)/src/lib/evil/libevil.la | 37 | lib_embryo_libembryo_la_LIBADD += lib/evil/libevil.la |
38 | endif | 38 | endif |
39 | 39 | ||
40 | lib_embryo_libembryo_la_LIBADD += -lm | 40 | lib_embryo_libembryo_la_LIBADD += -lm |
@@ -78,11 +78,11 @@ bin_embryo_embryo_cc_CPPFLAGS += \ | |||
78 | endif | 78 | endif |
79 | 79 | ||
80 | bin_embryo_embryo_cc_LDADD = \ | 80 | bin_embryo_embryo_cc_LDADD = \ |
81 | $(top_builddir)/src/lib/embryo/libembryo.la \ | 81 | lib/embryo/libembryo.la \ |
82 | $(top_builddir)/src/lib/eina/libeina.la | 82 | lib/eina/libeina.la |
83 | 83 | ||
84 | if HAVE_WINDOWS | 84 | if HAVE_WINDOWS |
85 | bin_embryo_embryo_cc_LDADD += $(top_builddir)/src/lib/evil/libevil.la | 85 | bin_embryo_embryo_cc_LDADD += lib/evil/libevil.la |
86 | endif | 86 | endif |
87 | 87 | ||
88 | EXTRA_DIST += \ | 88 | EXTRA_DIST += \ |
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index cc3b250f4f..6000066ef7 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am | |||
@@ -21,6 +21,6 @@ lib_eo_libeo_la_CPPFLAGS = \ | |||
21 | @EFL_CFLAGS@ \ | 21 | @EFL_CFLAGS@ \ |
22 | @EO_CFLAGS@ | 22 | @EO_CFLAGS@ |
23 | 23 | ||
24 | lib_eo_libeo_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EO_LIBS@ | 24 | lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ |
25 | 25 | ||
26 | lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ | 26 | 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 eb263c0453..cd5797ddd3 100644 --- a/src/Makefile_Evil.am +++ b/src/Makefile_Evil.am | |||
@@ -171,10 +171,10 @@ bin_evil_evil_suite_CPPFLAGS += \ | |||
171 | endif | 171 | endif |
172 | 172 | ||
173 | bin_evil_evil_suite_LDADD = \ | 173 | bin_evil_evil_suite_LDADD = \ |
174 | $(top_builddir)/src/lib/evil/libevil.la \ | 174 | lib/evil/libevil.la \ |
175 | $(top_builddir)/src/lib/eina/libdl.la \ | 175 | lib/eina/libdl.la \ |
176 | -lm | 176 | -lm |
177 | 177 | ||
178 | bin_evil_test_evil_SOURCES = bin/evil/test_evil.c | 178 | bin_evil_test_evil_SOURCES = bin/evil/test_evil.c |
179 | 179 | ||
180 | bin_evil_test_evil_LDADD = $(top_builddir)/src/lib/evil/libevil.la | 180 | bin_evil_test_evil_LDADD = lib/evil/libevil.la |