aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libical/ChangeLog7
-rw-r--r--libical/src/libical/Makefile.am6
2 files changed, 12 insertions, 1 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index 8d7166543c..0afb79e364 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-10 Ettore Perazzoli <ettore@ximian.com>
+
+ * src/libical/Makefile.am (libical_static_la_DEPENDENCIES): Make
+ libical-static.la depend on libical-evolution.la so they they are
+ not built in parallel by a parallel make, since that would break
+ libtool.
+
2003-02-07 Christian Neumair <chris@gnome-de.org>
* .cvsignore: Added missing files.
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
index 656ffbcdae..b818f2bb13 100644
--- a/libical/src/libical/Makefile.am
+++ b/libical/src/libical/Makefile.am
@@ -2,7 +2,7 @@
# FILE: Makefile.am
# CREATOR: eric
#
-# $Id: Makefile.am,v 1.34 2003/02/06 18:13:56 danw Exp $
+# $Id: Makefile.am,v 1.35 2003/02/10 15:53:20 ettore Exp $
#
#
# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -32,6 +32,10 @@ noinst_LTLIBRARIES = libical-static.la
libical_static_la_SOURCES = $(libical_evolution_la_SOURCES)
libical_static_la_LDFLAGS = --all-static
+# Make sure libical-evolution.la and libical-static.la are not built in
+# parallel when using a parallel make; libtool can't handle that.
+libical_static_la_DEPENDENCIES = libical-evolution.la
+
YFLAGS = -d -v -t -pical_yy
LFLAGS = -Pical_yy
LEX_OUTPUT_ROOT = lex.ical_yy