aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/Makefile.am2
-rw-r--r--calendar/gui/Makefile.am2
3 files changed, 7 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 14c2989fc1..0243424d18 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-09 Eskil Heyn Olsen <deity@eskil.dk>
+
+ * Makefile.am (#todo_conduit_control_applet_SOURCES): Fixed an
+ unwanted conditional on libcalendar_conduit_la_LDFLAGS
+
1999-11-05 Eskil Heyn Olsen <deity@eskil.dk>
* calendar-conduit-control-applet.c (readStateCfg): Commented the
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index f08b4df06a..510ef8e80a 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -120,6 +120,7 @@ calendar_pilot_sync_LDADD = \
if HAVE_GNOME_PILOT
#calendar_conduit
calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
+endif
calendar_conduits_LTLIBRARIES = libcalendar_conduit.la
@@ -183,7 +184,6 @@ calendar_conduit_control_applet_LDADD = \
# $(GNOMEUI_LIBS) \
# $(GNOME_PILOT_LIBS) \
# $(INTLLIBS)
-endif
gnomecal_LDADD = $(LINK_FLAGS)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index f08b4df06a..510ef8e80a 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -120,6 +120,7 @@ calendar_pilot_sync_LDADD = \
if HAVE_GNOME_PILOT
#calendar_conduit
calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
+endif
calendar_conduits_LTLIBRARIES = libcalendar_conduit.la
@@ -183,7 +184,6 @@ calendar_conduit_control_applet_LDADD = \
# $(GNOMEUI_LIBS) \
# $(GNOME_PILOT_LIBS) \
# $(INTLLIBS)
-endif
gnomecal_LDADD = $(LINK_FLAGS)