aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/Makefile.am5
-rw-r--r--calendar/gui/Makefile.am5
3 files changed, 8 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ee844cef2c..8c074c5a53 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+1999-07-31 Peter Teichman <pat4@acpub.duke.edu>
+
+ * Makefile.am: fixed this up slightly with respect to pilot conduits
+
1999-07-30 Jonathan Blandford <jrb@redhat.com>
* Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 95d699f730..a8abc3c180 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -13,7 +13,7 @@ CFLAGS += -Wall -Wunused -Wpointer-arith -Wmissing-declarations
INCLUDES = \
-I$(includedir) \
$(GNOME_INCLUDEDIR) \
- $(CONDUIT_INCLUDEDIR) \
+ $(GNOME_CONDUIT_INCLUDEDIR) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
bin_PROGRAMS = gnomecal calendar-pilot-sync
@@ -114,8 +114,7 @@ calendar_conduits_LTLIBRARIES = \
libcalendar_conduit.la
libcalendar_conduit_la_LIBADD = \
- $(CONDUIT_LIBDIR) \
- $(CONDUIT_LIBS) \
+ $(GNOME_CONDUIT_LIBS) \
$(GNOME_LIBDIR) \
$(GNOME_LIBS)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 95d699f730..a8abc3c180 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -13,7 +13,7 @@ CFLAGS += -Wall -Wunused -Wpointer-arith -Wmissing-declarations
INCLUDES = \
-I$(includedir) \
$(GNOME_INCLUDEDIR) \
- $(CONDUIT_INCLUDEDIR) \
+ $(GNOME_CONDUIT_INCLUDEDIR) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
bin_PROGRAMS = gnomecal calendar-pilot-sync
@@ -114,8 +114,7 @@ calendar_conduits_LTLIBRARIES = \
libcalendar_conduit.la
libcalendar_conduit_la_LIBADD = \
- $(CONDUIT_LIBDIR) \
- $(CONDUIT_LIBS) \
+ $(GNOME_CONDUIT_LIBS) \
$(GNOME_LIBDIR) \
$(GNOME_LIBS)