From c02069a5f1ddcf371243e8527e80e28c98350b63 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 10 Jul 2000 23:43:59 +0000 Subject: Disable Pilot conduit stuff for now. It's not quite ready yet and it depends on CVS gnome-pilot. svn path=/trunk/; revision=4072 --- calendar/ChangeLog | 6 ++++++ calendar/Makefile.am | 2 +- calendar/gui/Makefile.am | 29 +---------------------------- 3 files changed, 8 insertions(+), 29 deletions(-) (limited to 'calendar') 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 + + * gui/Makefile.am: Remove pilot stuff for now. + + * Makefile.am (SUBDIRS): Remove `conduits'. + 2000-07-10 Dan Winship * 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 - -- cgit