aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/Makefile.am2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d21a6ffe..7908b881c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-11 Tomasz Kłoczko <kloczek@pld.org.pl>
+
+ * src/Makefile.am:
+ Fxs parallel build ("make -j<N>").
+ Do not include full path to .la file in case when it is in current
+ directory (it breaks dependences framework generated by automake in
+ Makefile file).
+
2005-01-11 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a1eadc4c..b78060cc7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -130,7 +130,7 @@ epiphany_CFLAGS = \
epiphany_LDFLAGS = -R$(MOZILLA_HOME) -dlopen self
epiphany_LDADD = \
- $(top_builddir)/src/libephymain.la \
+ libephymain.la \
$(top_builddir)/src/bookmarks/libephybookmarks.la \
$(top_builddir)/embed/libephyembedfactory.la \
$(top_builddir)/embed/mozilla/libephymozillaembed.la \