aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@ximian.com>2001-06-27 06:32:38 +0800
committerPeter Williams <peterw@src.gnome.org>2001-06-27 06:32:38 +0800
commit7f184616bdff730ee67d4f6dde5b982251be16a9 (patch)
tree96e71332178cae3977b43c4a8901fa995f325eef
parente13e11965b4d62751bf6d50f5fc65c645e6f1e2b (diff)
downloadgsoc2013-evolution-7f184616bdff730ee67d4f6dde5b982251be16a9.tar
gsoc2013-evolution-7f184616bdff730ee67d4f6dde5b982251be16a9.tar.gz
gsoc2013-evolution-7f184616bdff730ee67d4f6dde5b982251be16a9.tar.bz2
gsoc2013-evolution-7f184616bdff730ee67d4f6dde5b982251be16a9.tar.lz
gsoc2013-evolution-7f184616bdff730ee67d4f6dde5b982251be16a9.tar.xz
gsoc2013-evolution-7f184616bdff730ee67d4f6dde5b982251be16a9.tar.zst
gsoc2013-evolution-7f184616bdff730ee67d4f6dde5b982251be16a9.zip
libwombat:
2001-06-25 Peter Williams <peterw@ximian.com> * Makefile.am (libwombat_static_la_SOURCES): Create a static libwombat for the conduits. calendar: 2001-06-25 Peter Williams <peterw@ximian.com> * conduits/calendar/Makefile.am (INCLUDES): Fixes for srcdir != builddir. Link to the static libwombat. * conduits/todo/Makefile.am (INCLUDES): Here too. addressbook: 2001-06-25 Peter Williams <peterw@ximian.com> * conduit/Makefile.am (INCLUDES): Fix for srcdir != builddir. svn path=/trunk/; revision=10511
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/conduit/Makefile.am1
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/conduits/calendar/Makefile.am2
-rw-r--r--libwombat/ChangeLog5
-rw-r--r--libwombat/Makefile.am7
6 files changed, 26 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e98d406b16..09c75a89e0 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-25 Peter Williams <peterw@ximian.com>
+
+ * conduit/Makefile.am (INCLUDES): Fix for srcdir != builddir.
+
2001-06-25 Chris Toshok <toshok@ximian.com>
* gui/contact-list-editor/contact-list-editor.glade: change layout
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index ab5ea0ec50..d95d858fd8 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook \
-I$(top_srcdir)/addressbook/backend \
+ -I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
$(BONOBO_GNOME_CFLAGS) \
$(PISOCK_CFLAGS) \
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 95340dc1b4..1c1e0a1ecd 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-25 Peter Williams <peterw@ximian.com>
+
+ * conduits/calendar/Makefile.am (INCLUDES): Fixes for
+ srcdir != builddir. Link to the static libwombat.
+
+ * conduits/todo/Makefile.am (INCLUDES): Here too.
+
2001-06-24 Federico Mena Quintero <federico@ximian.com>
* gui/alarm-notify/notify-main.c (main): Initialize libglade.
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 8d8b81a9ee..bfe253c6c4 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -3,6 +3,7 @@ INCLUDES = \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
+ -I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
$(BONOBO_GNOME_CFLAGS) \
$(PISOCK_CFLAGS) \
@@ -23,6 +24,7 @@ libecalendar_conduit_la_LIBADD = \
$(top_builddir)/calendar/cal-util/libcal-util-static.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-static.la \
+ $(top_builddir)/libwombat/libwombat-static.la \
$(top_builddir)/e-util/libeconduit-static.la \
$(BONOBO_GNOME_LIBS) \
$(PISOCK_LIBS) \
diff --git a/libwombat/ChangeLog b/libwombat/ChangeLog
index e57a63dc8e..ee061f99e0 100644
--- a/libwombat/ChangeLog
+++ b/libwombat/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-25 <peterw@ximian.com>
+
+ * Makefile.am (libwombat_static_la_SOURCES): Create a static
+ libwombat for the conduits.
+
2001-06-23 Jason Leach <jleach@ximian.com>
* Makefile.am: builddir != srcdir fixes.
diff --git a/libwombat/Makefile.am b/libwombat/Makefile.am
index 7219569145..9fa5bd9c70 100644
--- a/libwombat/Makefile.am
+++ b/libwombat/Makefile.am
@@ -28,3 +28,10 @@ libwombat_la_SOURCES = \
$(IDL_GENERATED) \
wombat-client.c \
$(wombatinclude_HEADERS)
+
+# Static lib for pilot conduits
+
+noinst_LTLIBRARIES = libwombat-static.la
+
+libwombat_static_la_SOURCES = $(libwombat_la_SOURCES)
+libwombat_static_la_LDFLAGS = --all-static