aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-07-11 07:43:59 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-07-11 07:43:59 +0800
commitc02069a5f1ddcf371243e8527e80e28c98350b63 (patch)
tree5939f0c8c9b97a9703077f5b94afb39d6b370f36
parentd15735bd1bc999e5d7e015a756d7804a177da495 (diff)
downloadgsoc2013-evolution-c02069a5f1ddcf371243e8527e80e28c98350b63.tar
gsoc2013-evolution-c02069a5f1ddcf371243e8527e80e28c98350b63.tar.gz
gsoc2013-evolution-c02069a5f1ddcf371243e8527e80e28c98350b63.tar.bz2
gsoc2013-evolution-c02069a5f1ddcf371243e8527e80e28c98350b63.tar.lz
gsoc2013-evolution-c02069a5f1ddcf371243e8527e80e28c98350b63.tar.xz
gsoc2013-evolution-c02069a5f1ddcf371243e8527e80e28c98350b63.tar.zst
gsoc2013-evolution-c02069a5f1ddcf371243e8527e80e28c98350b63.zip
Disable Pilot conduit stuff for now. It's not quite ready yet and it
depends on CVS gnome-pilot. svn path=/trunk/; revision=4072
-rw-r--r--ChangeLog5
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/Makefile.am2
-rw-r--r--calendar/gui/Makefile.am29
-rw-r--r--configure.in2
5 files changed, 13 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 5858ed7f5b..197e7ec82f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-10 Ettore Perazzoli <ettore@helixcode.com>
+
+ * configure.in: Remove the conduits stuff for now. They depend on
+ CVS gnome-pilot, and this is not good for the release.
+
2000-07-10 Dan Winship <danw@helixcode.com>
* README: updates
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d3940936a1..ca2e79701c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-10 Ettore Perazzoli <ettore@helixcode.com>
+
+ * gui/Makefile.am: Remove pilot stuff for now.
+
+ * Makefile.am (SUBDIRS): Remove `conduits'.
+
2000-07-10 Dan Winship <danw@helixcode.com>
* gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index de67541fa6..11bf33a571 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1 +1 @@
-SUBDIRS = doc idl cal-util pcs cal-client gui conduits
+SUBDIRS = doc idl cal-util pcs cal-client gui
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 9ae3797de7..fc5e6eb216 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -2,13 +2,7 @@ SUBDIRS = dialogs
help_base = $(datadir)/gnome/help/cal
-if HAVE_GNOME_PILOT
-CPS = calendar-pilot-sync
-else
-CPS =
-endif
-
-bin_PROGRAMS = evolution-calendar $(CPS)
+bin_PROGRAMS = evolution-calendar
CPPFLAGS = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
@@ -104,26 +98,6 @@ evolution_calendar_LDADD = \
evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
-if HAVE_GNOME_PILOT
-calendar_pilot_sync_SOURCES = \
- calendar-pilot-sync.c
-
-calendar_pilot_sync_INCLUDES = \
- $(INCLUDES) \
- $(GNOME_PILOT_CFLAGS) \
- $(PISOCK_INCLUDEDIR) \
- $(GNOME_CONDUIT_INCLUDEDIR)
-
-calendar_pilot_sync_LDADD = -lpisock \
- $(BONOBO_VFS_GNOME_LIBS) \
- $(LINK_FLAGS) \
- $(EXTRA_GNOME_LIBS) \
- $(BONOBO_HTML_GNOME_LIBS) \
- $(GNOME_PILOT_LIBS) \
- $(PISOCK_LIBS)
-endif
-
-
if USING_OAF
oafdir = $(datadir)/oaf
oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo
@@ -162,4 +136,3 @@ evolution-calendar.pure: evolution-calendar
$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)
endif
-
diff --git a/configure.in b/configure.in
index 760a16927b..2e45957c6d 100644
--- a/configure.in
+++ b/configure.in
@@ -519,8 +519,6 @@ calendar/cal-client/Makefile
calendar/pcs/Makefile
calendar/gui/Makefile
calendar/gui/dialogs/Makefile
-calendar/conduits/Makefile
-calendar/conduits/calendar/Makefile
filter/Makefile
notes/Makefile
wombat/Makefile