aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/Makefile.am29
-rw-r--r--calendar/cal-client/cal-util.h1
-rw-r--r--calendar/cal-util.h1
-rw-r--r--calendar/gui/Makefile.am29
5 files changed, 59 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d6de810f36..53a3570d2b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-01 Federico Mena Quintero <federico@helixcode.com>
+
+ * Makefile.am: Use the gnome-config flags for orbit-idl.
+ Create a libcal-client library with the calendar client object.
+
2000-02-29 Federico Mena Quintero <federico@helixcode.com>
* Makefile.am: Removed stale rule for the conduit.
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 8e2ea78dde..da5a843d0b 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -5,6 +5,8 @@ idl_DATA = \
GnomeCal.idl \
evolution-calendar.idl
+idl_flags = `$(GNOME_CONFIG) --cflags idl`
+
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
gnomecal.gnorba \
@@ -20,6 +22,8 @@ endif
bin_PROGRAMS = gnomecal tlacuache $(extra_pilot_bins)
+lib_LTLIBRARIES = libcal-client.la
+
ICAL_LINK_FLAGS = ../libical/src/libical/libical.la
INCLUDES = \
@@ -38,7 +42,7 @@ GNOMECAL_CORBA_GENERATED = \
GnomeCal-stubs.c
$(GNOMECAL_CORBA_GENERATED): GnomeCal.idl
- orbit-idl $(srcdir)/GnomeCal.idl
+ $(ORBIT_IDL) $(idl_flags) $(srcdir)/GnomeCal.idl
corba-cal.c \
corba-cal.h \
@@ -52,7 +56,7 @@ EVOLUTION_CALENDAR_CORBA_GENERATED = \
evolution-calendar-stubs.c
$(EVOLUTION_CALENDAR_CORBA_GENERATED): evolution-calendar.idl
- orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl $(srcdir)/evolution-calendar.idl
+ $(ORBIT_IDL) $(idl_flags) $(srcdir)/evolution-calendar.idl
gnomecal_SOURCES = \
$(EVOLUTION_CALENDAR_CORBA_GENERATED) \
@@ -129,6 +133,27 @@ calendar_pilot_sync_SOURCES = \
timeutil.c \
timeutil.h
+#
+# cal-client library
+#
+
+libcal_clientincludedir = $(includedir)/cal-client
+
+libcal_client_la_SOURCES = \
+ $(EVOLUTION_CALENDAR_CORBA_GENERATED) \
+ cal-client.c \
+ cal-listener.c \
+ cal-util.c
+
+libcal_clientinclude_HEADERS = \
+ cal-client.h \
+ cal-listener.h \
+ cal-util.h
+
+#
+# tlacuache personal calendar server
+#
+
tlacuache_SOURCES = \
$(EVOLUTION_CALENDAR_CORBA_GENERATED) \
alarm.c \
diff --git a/calendar/cal-client/cal-util.h b/calendar/cal-client/cal-util.h
index 45be343a28..5087eee4d3 100644
--- a/calendar/cal-client/cal-util.h
+++ b/calendar/cal-client/cal-util.h
@@ -25,7 +25,6 @@
#include <libgnome/gnome-defs.h>
#include <time.h>
#include <glib.h>
-#include "calobj.h"
BEGIN_GNOME_DECLS
diff --git a/calendar/cal-util.h b/calendar/cal-util.h
index 45be343a28..5087eee4d3 100644
--- a/calendar/cal-util.h
+++ b/calendar/cal-util.h
@@ -25,7 +25,6 @@
#include <libgnome/gnome-defs.h>
#include <time.h>
#include <glib.h>
-#include "calobj.h"
BEGIN_GNOME_DECLS
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 8e2ea78dde..da5a843d0b 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -5,6 +5,8 @@ idl_DATA = \
GnomeCal.idl \
evolution-calendar.idl
+idl_flags = `$(GNOME_CONFIG) --cflags idl`
+
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
gnomecal.gnorba \
@@ -20,6 +22,8 @@ endif
bin_PROGRAMS = gnomecal tlacuache $(extra_pilot_bins)
+lib_LTLIBRARIES = libcal-client.la
+
ICAL_LINK_FLAGS = ../libical/src/libical/libical.la
INCLUDES = \
@@ -38,7 +42,7 @@ GNOMECAL_CORBA_GENERATED = \
GnomeCal-stubs.c
$(GNOMECAL_CORBA_GENERATED): GnomeCal.idl
- orbit-idl $(srcdir)/GnomeCal.idl
+ $(ORBIT_IDL) $(idl_flags) $(srcdir)/GnomeCal.idl
corba-cal.c \
corba-cal.h \
@@ -52,7 +56,7 @@ EVOLUTION_CALENDAR_CORBA_GENERATED = \
evolution-calendar-stubs.c
$(EVOLUTION_CALENDAR_CORBA_GENERATED): evolution-calendar.idl
- orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl $(srcdir)/evolution-calendar.idl
+ $(ORBIT_IDL) $(idl_flags) $(srcdir)/evolution-calendar.idl
gnomecal_SOURCES = \
$(EVOLUTION_CALENDAR_CORBA_GENERATED) \
@@ -129,6 +133,27 @@ calendar_pilot_sync_SOURCES = \
timeutil.c \
timeutil.h
+#
+# cal-client library
+#
+
+libcal_clientincludedir = $(includedir)/cal-client
+
+libcal_client_la_SOURCES = \
+ $(EVOLUTION_CALENDAR_CORBA_GENERATED) \
+ cal-client.c \
+ cal-listener.c \
+ cal-util.c
+
+libcal_clientinclude_HEADERS = \
+ cal-client.h \
+ cal-listener.h \
+ cal-util.h
+
+#
+# tlacuache personal calendar server
+#
+
tlacuache_SOURCES = \
$(EVOLUTION_CALENDAR_CORBA_GENERATED) \
alarm.c \