From 5709aa9ef61dc720571acec93085f7d2d4ef4758 Mon Sep 17 00:00:00 2001 From: Peter Teichman Date: Sat, 31 Jul 1999 20:29:06 +0000 Subject: More auto* cleanups. The new calendar conduit now compiles conditionally, based on whether you have gnome-pilot installed. svn path=/trunk/; revision=1051 --- calendar/Makefile.am | 7 ++++--- calendar/gui/Makefile.am | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/calendar/Makefile.am b/calendar/Makefile.am index a8abc3c180..cd2459e22d 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = \ $(GNOME_CONDUIT_INCLUDEDIR) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -bin_PROGRAMS = gnomecal calendar-pilot-sync +bin_PROGRAMS = gnomecal calendar-pilot-sync GNOMECAL_CORBA_GENERATED = \ GnomeCal.h \ @@ -110,8 +110,9 @@ calendar_pilot_sync_LDADD = \ #calendar_conduit calendar_conduitsdir=$(libdir)/gnome-pilot/conduits -calendar_conduits_LTLIBRARIES = \ - libcalendar_conduit.la +calendar_conduits_LTLIBRARIES = @CALCONDUITLIB@ + +EXTRA_LTLIBRARIES = libcalendar_conduit.la libcalendar_conduit_la_LIBADD = \ $(GNOME_CONDUIT_LIBS) \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index a8abc3c180..cd2459e22d 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = \ $(GNOME_CONDUIT_INCLUDEDIR) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -bin_PROGRAMS = gnomecal calendar-pilot-sync +bin_PROGRAMS = gnomecal calendar-pilot-sync GNOMECAL_CORBA_GENERATED = \ GnomeCal.h \ @@ -110,8 +110,9 @@ calendar_pilot_sync_LDADD = \ #calendar_conduit calendar_conduitsdir=$(libdir)/gnome-pilot/conduits -calendar_conduits_LTLIBRARIES = \ - libcalendar_conduit.la +calendar_conduits_LTLIBRARIES = @CALCONDUITLIB@ + +EXTRA_LTLIBRARIES = libcalendar_conduit.la libcalendar_conduit_la_LIBADD = \ $(GNOME_CONDUIT_LIBS) \ -- cgit v1.2.3