aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Teichman <teichman@src.gnome.org>1999-08-01 04:29:06 +0800
committerPeter Teichman <teichman@src.gnome.org>1999-08-01 04:29:06 +0800
commit5709aa9ef61dc720571acec93085f7d2d4ef4758 (patch)
tree55c53a184e939398f680fb67d31dfa85c5ab4798
parentdc41ba6c011504f21bb84a32940485a304faf4fc (diff)
downloadgsoc2013-evolution-5709aa9ef61dc720571acec93085f7d2d4ef4758.tar.gz
gsoc2013-evolution-5709aa9ef61dc720571acec93085f7d2d4ef4758.tar.zst
gsoc2013-evolution-5709aa9ef61dc720571acec93085f7d2d4ef4758.zip
More auto* cleanups. The new calendar conduit now compiles conditionally,
based on whether you have gnome-pilot installed. svn path=/trunk/; revision=1051
-rw-r--r--calendar/Makefile.am7
-rw-r--r--calendar/gui/Makefile.am7
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) \