aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/Makefile.am8
-rw-r--r--calendar/gui/Makefile.am8
3 files changed, 14 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 5c3ceb9448..6cc4fa71f1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-09 Eskil Heyn Olsen <deity@eskil.dk>
+
+ * Makefile.am: Changes to remove todo capplet stuff from distro.
+
2000-01-08 Vadim Strizhevsky <vadim@optonline.net>
* calendar-conduit-control-applet.c: Added pilotID argument to
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 914bd8c398..006102a2a7 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -194,8 +194,8 @@ PalmPilotdir = $(ccenterdir)/Peripherals/PalmPilot
Conduitsdir = $(PalmPilotdir)/Conduits
Conduits_DATA = \
- calendar-conduit-control-applet.desktop \
- todo-conduit-control-applet.desktop
+ calendar-conduit-control-applet.desktop
+# todo-conduit-control-applet.desktop
Conduits_seconddir = $(datadir)/gnome/apps/Settings/Peripherals/PalmPilot/Conduits/
Conduits_second_DATA = $(Conduits_DATA)
@@ -204,13 +204,15 @@ endif
EXTRA_DIST = \
gncal.desktop \
calendar-conduit-control-applet.desktop \
- todo-conduit-control-applet.desktop \
bell.xpm \
recur.xpm \
$(idl_DATA) \
$(gnorba_DATA) \
gnome-calendar-conduit.png
+# todo-conduit-control-applet.desktop \
+
+
appicondir = $(datadir)/pixmaps
appicon_DATA = gnome-calendar-conduit.png
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 914bd8c398..006102a2a7 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -194,8 +194,8 @@ PalmPilotdir = $(ccenterdir)/Peripherals/PalmPilot
Conduitsdir = $(PalmPilotdir)/Conduits
Conduits_DATA = \
- calendar-conduit-control-applet.desktop \
- todo-conduit-control-applet.desktop
+ calendar-conduit-control-applet.desktop
+# todo-conduit-control-applet.desktop
Conduits_seconddir = $(datadir)/gnome/apps/Settings/Peripherals/PalmPilot/Conduits/
Conduits_second_DATA = $(Conduits_DATA)
@@ -204,13 +204,15 @@ endif
EXTRA_DIST = \
gncal.desktop \
calendar-conduit-control-applet.desktop \
- todo-conduit-control-applet.desktop \
bell.xpm \
recur.xpm \
$(idl_DATA) \
$(gnorba_DATA) \
gnome-calendar-conduit.png
+# todo-conduit-control-applet.desktop \
+
+
appicondir = $(datadir)/pixmaps
appicon_DATA = gnome-calendar-conduit.png