aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog12
-rw-r--r--calendar/cal-client/Makefile.am2
-rw-r--r--calendar/cal-util/Makefile.am2
-rw-r--r--calendar/conduits/calendar/Makefile.am2
-rw-r--r--calendar/conduits/todo/Makefile.am2
-rw-r--r--calendar/gui/Makefile.am22
-rw-r--r--libical/ChangeLog4
-rw-r--r--libical/Makefile.am5
-rw-r--r--libical/configure.in1
-rw-r--r--libical/examples/Makefile.am2
-rw-r--r--wombat/ChangeLog4
-rw-r--r--wombat/Makefile.am2
12 files changed, 41 insertions, 19 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7d66a7730d..30bd2bbd5c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,17 @@
2000-12-11 Federico Mena Quintero <federico@helixcode.com>
+ * cal-util/Makefile.am (test_recur_LDADD): Link to the libical
+ shared library.
+
+ * cal-client/Makefile.am (client_test_LDADD): Likewise.
+
+ * conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
+ Likewise.
+
+ * gui/Makefile.am (LINK_FLAGS): Likewise.
+
+2000-12-11 Federico Mena Quintero <federico@helixcode.com>
+
This is to make things work with libical 0.21helix1 and later.
Warnings remain because at last libical was constified; will take
care of those tomorrow.
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 2bcaa89797..f241bf6ce1 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -71,7 +71,7 @@ client_test_LDADD = \
-lunicode \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical.a \
+ $(top_builddir)/libical/src/libical/libical.la \
libcal-client.la
BUILT_SOURCES = $(CORBA_GENERATED)
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index 9a1b677e9b..80c8da2662 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -45,5 +45,5 @@ test_recur_SOURCES = \
test_recur_LDADD = \
libcal-util.la \
$(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical.a \
+ $(top_builddir)/libical/src/libical/libical.la \
$(EXTRA_GNOME_LIBS)
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 0acb102db1..26fb3bee2d 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -37,7 +37,7 @@ libecalendar_conduit_la_LIBADD = \
$(top_builddir)/calendar/cal-client/libcal-client-static.la \
$(top_builddir)/calendar/cal-util/libcal-util-static.la \
$(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical-static.la \
+ $(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/e-util/libeconduit-static.la \
$(BONOBO_VFS_GNOME_LIBS) \
$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index b0df8e91a4..730eca729a 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -37,7 +37,7 @@ libetodo_conduit_la_LIBADD = \
$(top_builddir)/calendar/cal-client/libcal-client-static.la \
$(top_builddir)/calendar/cal-util/libcal-util-static.la \
$(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical-static.la \
+ $(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/e-util/libeconduit-static.la \
$(BONOBO_VFS_GNOME_LIBS) \
$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index df422d6b96..2268fa2b3c 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -35,17 +35,17 @@ INCLUDES = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
-LINK_FLAGS = \
- $(BONOBO_VFS_GNOME_LIBS) \
- $(EXTRA_GNOME_LIBS) \
- $(INTLLIBS) \
- dialogs/libcal-dialogs.a \
- $(top_builddir)/calendar/cal-client/libcal-client.la \
- $(top_builddir)/calendar/cal-util/libcal-util.la \
- $(top_builddir)/widgets/misc/libemiscwidgets.a \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical.a \
+LINK_FLAGS = \
+ $(BONOBO_VFS_GNOME_LIBS) \
+ $(EXTRA_GNOME_LIBS) \
+ $(INTLLIBS) \
+ dialogs/libcal-dialogs.a \
+ $(top_builddir)/calendar/cal-client/libcal-client.la \
+ $(top_builddir)/calendar/cal-util/libcal-util.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.a \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/libversit/libversit.la \
+ $(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a
gladedir = $(datadir)/evolution/glade
diff --git a/libical/ChangeLog b/libical/ChangeLog
index a32b82d761..43b9547fc9 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,5 +1,9 @@
2000-12-11 Federico Mena Quintero <federico@helixcode.com>
+ * Makefile.am:
+ * configure.in: Disable compilation of the examples directory
+ until libicalss is fixed.
+
* configure.in: Make AC_INIT() check for a file that is not
autogenerated!
diff --git a/libical/Makefile.am b/libical/Makefile.am
index e13464d7aa..a71157bed4 100644
--- a/libical/Makefile.am
+++ b/libical/Makefile.am
@@ -5,5 +5,8 @@ EXTRA_DIST = \
TEST \
TODO
-SUBDIRS = design-data doc scripts test-data src examples
+SUBDIRS = design-data doc scripts test-data src
+
+# Disabled examples until it builds
+#SUBDIRS = design-data doc scripts test-data src examples
diff --git a/libical/configure.in b/libical/configure.in
index d3fd3d94b1..4413519481 100644
--- a/libical/configure.in
+++ b/libical/configure.in
@@ -46,7 +46,6 @@ AC_OUTPUT([
Makefile
design-data/Makefile
doc/Makefile
-examples/Makefile
scripts/Makefile
src/Makefile
src/libical/Makefile
diff --git a/libical/examples/Makefile.am b/libical/examples/Makefile.am
index e4faf547a7..470753062f 100644
--- a/libical/examples/Makefile.am
+++ b/libical/examples/Makefile.am
@@ -1,7 +1,7 @@
noinst_PROGRAMS = doesnothing
-LDADD = ../src/libical/libical.a ../src/libicalss/libicalss.a ../src/libicalvcal/libicalvcal.a
+LDADD = ../src/libical/libical.a ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la
INCLUDES = -I . -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal
doesnothing_SOURCES = \
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 319c0c3544..f5aa780ddb 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-11 Federico Mena Quintero <federico@helixcode.com>
+
+ * Makefile.am (wombat_LDADD): Link to the libical shared library.
+
2000-11-11 Matt Bissiri <bissiri@eecs.umich.edu>
* wombat.oafinfo:
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index a8ce0dcfb2..80bd0b7ae8 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -26,7 +26,7 @@ wombat_LDADD = \
$(top_builddir)/e-util/ename/libename.la \
$(top_builddir)/calendar/pcs/libpcs.a \
$(top_builddir)/calendar/cal-util/libcal-util.la \
- $(top_builddir)/libical/src/libical/libical.a \
+ $(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeutil.la \
$(LDAP_LIBS)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 10:47:53 +0800