aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/Makefile.am
diff options
context:
space:
mode:
authorEskil Heyn Olsen <eskil@src.gnome.org>1999-09-23 13:58:40 +0800
committerEskil Heyn Olsen <eskil@src.gnome.org>1999-09-23 13:58:40 +0800
commit2c445af1247951fb2947d833e97814ecfeb85616 (patch)
treec9e1d47549f5dcbc83f375d8784af0c23f0b0db2 /calendar/Makefile.am
parentaf628520342c2374267f0e9fa611ef6bad9e7076 (diff)
downloadgsoc2013-evolution-2c445af1247951fb2947d833e97814ecfeb85616.tar.gz
gsoc2013-evolution-2c445af1247951fb2947d833e97814ecfeb85616.tar.zst
gsoc2013-evolution-2c445af1247951fb2947d833e97814ecfeb85616.zip
better merge of summary/description when doing ical_from_remote
* calendar-conduit.c: better merge of summary/description when doing ical_from_remote (update_record), also handles import from gnomecal to pilot better, and on both ways, repeat events are much better now. svn path=/trunk/; revision=1253
Diffstat (limited to 'calendar/Makefile.am')
-rw-r--r--calendar/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index ed17a8aa6c..90aa6c628b 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -9,9 +9,10 @@ gnorba_DATA = gnomecal.gnorba
help_base = $(datadir)/gnome/help/cal
if HAVE_GNOME_PILOT
-EXTRA_PROGRAMS = todo-conduit-control-applet calendar-conduit-control-applet
-endif
+bin_PROGRAMS = gnomecal todo-conduit-control-applet calendar-conduit-control-applet
+else
bin_PROGRAMS = gnomecal
+endif
INCLUDES = \
-I$(includedir) \