aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/Makefile.am24
-rw-r--r--calendar/gui/Makefile.am24
3 files changed, 50 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 680ed271cf..ee844cef2c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+1999-07-30 Jonathan Blandford <jrb@redhat.com>
+
+ * Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff
+
1999-07-29 Jonathan Blandford <jrb@redhat.com>
* gnome-cal.c (setup_widgets): Add scrolling to the yearview.
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index e4fa401aad..95d699f730 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -13,9 +13,10 @@ CFLAGS += -Wall -Wunused -Wpointer-arith -Wmissing-declarations
INCLUDES = \
-I$(includedir) \
$(GNOME_INCLUDEDIR) \
+ $(CONDUIT_INCLUDEDIR) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-bin_PROGRAMS = gnomecal calendar-pilot-sync
+bin_PROGRAMS = gnomecal calendar-pilot-sync
GNOMECAL_CORBA_GENERATED = \
GnomeCal.h \
@@ -92,6 +93,8 @@ calendar_pilot_sync_SOURCES = \
timeutil.c \
timeutil.h
+
+
LINK_FLAGS = \
$(GNOME_LIBDIR) \
$(GNOMEGNORBA_LIBS) \
@@ -103,6 +106,25 @@ calendar_pilot_sync_LDADD = \
$(PILOT_LIBS) \
$(LINK_FLAGS)
+
+#calendar_conduit
+calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
+
+calendar_conduits_LTLIBRARIES = \
+ libcalendar_conduit.la
+
+libcalendar_conduit_la_LIBADD = \
+ $(CONDUIT_LIBDIR) \
+ $(CONDUIT_LIBS) \
+ $(GNOME_LIBDIR) \
+ $(GNOME_LIBS)
+
+libcalendar_conduit_la_SOURCES = \
+ calendar-conduit.c
+
+#libcalendar_conduit_la_OBJECTS = \
+# calendar-conduit.o
+
#gncal_LDADD = $(LINK_FLAGS)
gnomecal_LDADD = $(LINK_FLAGS)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index e4fa401aad..95d699f730 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -13,9 +13,10 @@ CFLAGS += -Wall -Wunused -Wpointer-arith -Wmissing-declarations
INCLUDES = \
-I$(includedir) \
$(GNOME_INCLUDEDIR) \
+ $(CONDUIT_INCLUDEDIR) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-bin_PROGRAMS = gnomecal calendar-pilot-sync
+bin_PROGRAMS = gnomecal calendar-pilot-sync
GNOMECAL_CORBA_GENERATED = \
GnomeCal.h \
@@ -92,6 +93,8 @@ calendar_pilot_sync_SOURCES = \
timeutil.c \
timeutil.h
+
+
LINK_FLAGS = \
$(GNOME_LIBDIR) \
$(GNOMEGNORBA_LIBS) \
@@ -103,6 +106,25 @@ calendar_pilot_sync_LDADD = \
$(PILOT_LIBS) \
$(LINK_FLAGS)
+
+#calendar_conduit
+calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
+
+calendar_conduits_LTLIBRARIES = \
+ libcalendar_conduit.la
+
+libcalendar_conduit_la_LIBADD = \
+ $(CONDUIT_LIBDIR) \
+ $(CONDUIT_LIBS) \
+ $(GNOME_LIBDIR) \
+ $(GNOME_LIBS)
+
+libcalendar_conduit_la_SOURCES = \
+ calendar-conduit.c
+
+#libcalendar_conduit_la_OBJECTS = \
+# calendar-conduit.o
+
#gncal_LDADD = $(LINK_FLAGS)
gnomecal_LDADD = $(LINK_FLAGS)