aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/Makefile.am12
-rw-r--r--calendar/gui/Makefile.am12
3 files changed, 21 insertions, 14 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 050baea228..c5156c15e3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+1999-11-14 Eskil Heyn Olsen <deity@eskil.dk>
+
+ * Makefile.am: Stupid misplaced endif cause gncal to depend on an
+ install gnome-pilot... fixed... sorry.
+
+1999-11-12 Eskil Heyn Olsen <deity@eskil.dk>
+
+ * Makefile.am (extra_pilot_bins): Fixed the if then else problem,
+ using solution suggested by James Henstridge, appears to be caused
+ by a (by now fixed) bug in my automake.
+
1999-11-12 Russell Steinthal <rms39@columbia.edu>
* prop.c: Config code for timeout, make Alarms property page use a
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 510ef8e80a..652f78c8f8 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -9,13 +9,11 @@ gnorba_DATA = gnomecal.gnorba
help_base = $(datadir)/gnome/help/cal
if HAVE_GNOME_PILOT
-bin_PROGRAMS = \
- gnomecal \
- calendar-conduit-control-applet \
- calendar-pilot-sync
-else
-bin_PROGRAMS = gnomecal
+extra_pilot_bins = \
+ calendar-conduit-control-applet \
+ calendar-pilot-sync
endif
+bin_PROGRAMS = gnomecal $(extra_pilot_bins)
INCLUDES = \
-I$(includedir) \
@@ -120,9 +118,9 @@ calendar_pilot_sync_LDADD = \
if HAVE_GNOME_PILOT
#calendar_conduit
calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
-endif
calendar_conduits_LTLIBRARIES = libcalendar_conduit.la
+endif
libcalendar_conduit_la_SOURCES = \
GnomeCal-common.c \
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 510ef8e80a..652f78c8f8 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -9,13 +9,11 @@ gnorba_DATA = gnomecal.gnorba
help_base = $(datadir)/gnome/help/cal
if HAVE_GNOME_PILOT
-bin_PROGRAMS = \
- gnomecal \
- calendar-conduit-control-applet \
- calendar-pilot-sync
-else
-bin_PROGRAMS = gnomecal
+extra_pilot_bins = \
+ calendar-conduit-control-applet \
+ calendar-pilot-sync
endif
+bin_PROGRAMS = gnomecal $(extra_pilot_bins)
INCLUDES = \
-I$(includedir) \
@@ -120,9 +118,9 @@ calendar_pilot_sync_LDADD = \
if HAVE_GNOME_PILOT
#calendar_conduit
calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
-endif
calendar_conduits_LTLIBRARIES = libcalendar_conduit.la
+endif
libcalendar_conduit_la_SOURCES = \
GnomeCal-common.c \