aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorHans Petter Jansson <hpj@ximian.com>2003-09-22 15:32:34 +0800
committerHans Petter <hansp@src.gnome.org>2003-09-22 15:32:34 +0800
commitc5a06d54f661243c0775dd3d40e173e661616c1b (patch)
treec5dae46f26c445eed43e883386643303039b893c /shell
parent88d4fd5eac6bf7bcfd845f548efabc9801199cd2 (diff)
downloadgsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar
gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.gz
gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.bz2
gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.lz
gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.xz
gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.tar.zst
gsoc2013-evolution-c5a06d54f661243c0775dd3d40e173e661616c1b.zip
libical.la -> libical-evolution.la
2003-09-22 Hans Petter Jansson <hpj@ximian.com> * calendar/cal-util/Makefile.am (libical_util_la_LIBADD): libical.la -> libical-evolution.la * calendar/importers/Makefile.am (libevolution_calendar_importers_la_LIBADD): libicalvcal.la -> libicalvcal-evolution.la * shell/Makefile.am (evolution_LDADD): libical.la -> libical-evolution.la * libical/configure.in: Require flex 2.5.31 and add a test for it. Rename WITH_CXX conditional to WITH_CXX_BINDINGS. * libical/examples/Makefile.am (doesnothing_LDADD): Add -evolution to lib names. * libical/src/test/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add -evolution to lib names. * libical/src/test/regression.c (main): WITH_CXX -> WITH_CXX_BINDINGS. * libical/src/libicalcap/Makefile.am: Add -evolution to lib names. Install to Evolution's priv dirs. * libical/src/libicalvcal/Makefile.am: Ditto. * libical/src/libical/Makefile.am: WITH_CXX -> WITH_CXX_BINDINGS. Add -evolution to lib names. Install in privlibdir. Install includes to $(privincludedir)/libical. * libical/src/libicalss/Makefile.am: Ditto. * libical/src/libicalss/icalsslexer.l: Replace option reentrant-bison with reentrant and bison-bridge. Use new Flex variable names. * libical/src/libical/icallexer.l: * libical/src/libical/icalyacc.y: * libical/src/libicalss/icalsslexer.c: * libical/src/libicalss/icalssyacc.c: * libical/src/libicalss/icalssyacc.h: Removed from repository. svn path=/trunk/; revision=22633
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog4
-rw-r--r--shell/Makefile.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ed69f30d1b..8e55cef2d3 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-22 Hans Petter Jansson <hpj@ximian.com>
+
+ * Makefile.am (evolution_LDADD): libical.la -> libical-evolution.la
+
2003-09-12 Frederic Crozat <fcrozat@mandrakesoft.com>
* e-config-upgrade.c: (utf8_reencode), (upgrade_xml_1_2_rec),
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 3e4d205da2..1631ccdef0 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -268,7 +268,7 @@ evolution_LDADD = \
$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/libical/src/libical/libical.la \
+ $(top_builddir)/libical/src/libical/libical-evolution.la \
$(SHELL_LIBS)
# Test component