From 47f01927e15b6eb279d2cbf046b2707467096666 Mon Sep 17 00:00:00 2001
From: Eskil Heyn Olsen <eskil@src.gnome.org>
Date: Fri, 22 Oct 1999 01:16:15 +0000
Subject: now it doesn't build todo conduit anymore. Since the conduit is just
 a

	* Makefile.am: now it doesn't build todo conduit
	anymore. Since the conduit is just a skeleton, no need to
	build and install it.

	* calendar-conduit-control-applet.c: revamped for all the
	changes in calendar-conduit.h. Also fixed the pilotId bug that
	all conduit capplets had.

	* calendar-conduit-control-applet.desktop: renamed to
	GnomeCalendar.

	* calendar-conduit.h: Fixed namespace pollution, appended GCal
	to structures, gcalconduit to methods. Introduced the
	GCalConduitContext.

	* calendar-conduit.c: No more global variables, all is contained
	in a GCalConduitContext variable, that all the signals are
	passed as user data.

svn path=/trunk/; revision=1338
---
 calendar/Makefile.am | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'calendar/Makefile.am')

diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index cb03a4eacb..4042368bff 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -11,7 +11,6 @@ help_base = $(datadir)/gnome/help/cal
 if HAVE_GNOME_PILOT
 bin_PROGRAMS = 				\
 	gnomecal 			\
-	todo-conduit-control-applet 	\
 	calendar-conduit-control-applet	\
 	calendar-pilot-sync
 else
@@ -158,34 +157,34 @@ calendar_conduit_control_applet_LDADD = \
         $(INTLLIBS) 
 
 #todo_conduit
-todo_conduitsdir=$(libdir)/gnome-pilot/conduits
+#todo_conduitsdir=$(libdir)/gnome-pilot/conduits
 
-todo_conduits_LTLIBRARIES = libtodo_conduit.la
+#todo_conduits_LTLIBRARIES = libtodo_conduit.la
 
-libtodo_conduit_la_LDFLAGS = \
-	-rpath $(libdir)
+#libtodo_conduit_la_LDFLAGS = \
+#	-rpath $(libdir)
 
-libtodo_conduit_la_LIBADD = \
-	$(GNOME_LIBDIR) \
-	$(GNOME_LIBS)
+#libtodo_conduit_la_LIBADD = \
+#	$(GNOME_LIBDIR) \
+#	$(GNOME_LIBS)
 
-libtodo_conduit_la_SOURCES = \
-	todo-conduit.c
+#libtodo_conduit_la_SOURCES = \
+#	todo-conduit.c
 
-todo-conduit.c:	GnomeCal.h
+#todo-conduit.c:	GnomeCal.h
 
-todo_conduit_control_applet_SOURCES = \
-	todo-conduit-control-applet.c
+#todo_conduit_control_applet_SOURCES = \
+#	todo-conduit-control-applet.c
 
-todo_conduit_control_applet_LDADD = \
-	$(CAPPLET_LIBS) \
-	$(GNOME_LIBDIR) \
-        $(GNOME_CAPPLET_LIBS) \
-        $(PISOCK_LIBS) \
-        $(GNOMEUI_LIBS) \
-        $(PISOCK_LIBS) \
-	$(GNOME_PILOT_LIBS) \
-        $(INTLLIBS) 
+#todo_conduit_control_applet_LDADD = \
+#	$(CAPPLET_LIBS) \
+#	$(GNOME_LIBDIR) \
+#	$(GNOME_CAPPLET_LIBS) \
+#	$(PISOCK_LIBS) \
+#	$(GNOMEUI_LIBS) \
+#	$(PISOCK_LIBS) \
+#	$(GNOME_PILOT_LIBS) \
+#	$(INTLLIBS) 
 endif
 
 gnomecal_LDADD = $(LINK_FLAGS)
-- 
cgit