aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
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 /calendar
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 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/cal-util/Makefile.am2
-rw-r--r--calendar/importers/Makefile.am2
3 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index da5e539c35..827b997321 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-22 Hans Petter Jansson <hpj@ximian.com>
+
+ * cal-util/Makefile.am (libical_util_la_LIBADD):
+ libical.la -> libical-evolution.la
+
+ * importers/Makefile.am (libevolution_calendar_importers_la_LIBADD):
+ libicalvcal.la -> libicalvcal-evolution.la
+
2003-09-16 Rodrigo Moya <rodrigo@ximian.com>
* conduits/todo/Makefile.am: removed libwombat reference.
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index d070271c0b..b7d6715ce0 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -26,7 +26,7 @@ libcal_util_la_SOURCES = \
timeutil.c
libcal_util_la_LIBADD = \
- $(top_builddir)/libical/src/libical/libical.la
+ $(top_builddir)/libical/src/libical/libical-evolution.la
libcal_utilincludedir = $(privincludedir)/cal-util
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index a1487c64a5..f660dc16cb 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -29,7 +29,7 @@ libevolution_calendar_importers_la_LDFLAGS = -avoid-version -module
libevolution_calendar_importers_la_LIBADD = \
$(top_builddir)/shell/importer/libevolution-importer.la \
- $(top_builddir)/libical/src/libicalvcal/libicalvcal.la \
+ $(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \
$(IMPORTERS_LIBS)
# evolution_calendar_importer_SOURCES = \