Renamed library from libcalutil to libcal-util, to be consistent with

2000-04-16  Federico Mena Quintero  <federico@helixcode.com>

	* cal-util/Makefile.am: Renamed library from libcalutil to
	libcal-util, to be consistent with libcal-client.  Install header
	files in $(includedir)/evolution/cal-util.
	(INCLUDES): Add "cal-util" log domain for glib.
	(libcal_clientincludedir): The header files are now installed in
	$(includedir)/evolution/cal-client.

	* cal-util/cal-util.h: Fix includes.

	* cal-client/client-test.c: Fix includes.

	* pcs/Makefile.am: Create libpcs.a, not a shared library, because
	it is for internal use by Wombat only.  The header files should
	not be installed, either.  Removed all the old Tlacuache stuff.

	* gui/Makefile.am (EXTRA_DIST): We no longer distribute
	gncal.desktop.
	(evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log
	domain.

	* gui/*.[ch]: Fix cal-util and cal-client includes.

	* pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib.

	* pcs/*.[ch]: Fix cal-util includes.

svn path=/trunk/; revision=2461

5 files changed, 16 insertions, 31 deletions

diff --git a/calendar/cal-util/.cvsignore b/calendar/cal-util/.cvsignore
index cd15c2b075..db4c89d448 100644
--- a/calendar/cal-util/.cvsignore
+++ b/calendar/cal-util/.cvsignore
@@ -2,5 +2,5 @@
 Makefile.in
 Makefile
 .deps
-libcalutil.la
-*.lo
\ No newline at end of file
+libcal-util.la
+*.lo
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
index 8a866efd49..248e5373e5 100644
--- a/calendar/cal-util/Makefile.am
+++ b/calendar/cal-util/Makefile.am
@@ -1,21 +1,24 @@
-
 INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-	-DG_LOG_DOMAIN=\"cal-client\"			\
+        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-DG_LOG_DOMAIN=\"cal-util\"			\
 	-I$(srcdir) -I$(top_srcdir) 			\
+	-I$(srcdir)/calendar				\
 	-I. 						\
 	-I.. 						\
 	-I$(top_builddir)				\
         -I$(includedir)                                 \
         $(GNOME_INCLUDEDIR)
 
-lib_LTLIBRARIES = libcalutil.la
+lib_LTLIBRARIES = libcal-util.la
 
-libcalutil_la_SOURCES = \
+libcal_util_la_SOURCES = \
 	cal-util.c	\
-	cal-util.h	\
 	calobj.c	\
-	calobj.h	\
-	timeutil.c	\
-	timeutil.h
+	timeutil.c
 
+libcal_utilincludedir = $(includedir)/evolution/cal-util
+
+libcal_utilinclude_HEADERS =	\
+	cal-util.h		\
+	calobj.h		\
+	timeutil.h
diff --git a/calendar/cal-util/alarm-enums.h b/calendar/cal-util/alarm-enums.h
deleted file mode 100644
index e35b471a09..0000000000
--- a/calendar/cal-util/alarm-enums.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef ALARM_ENUMS_H_INCLUDED
-#define ALARM_ENUMS_H_INCLUDED
-
-
-enum AlarmType {
-	ALARM_MAIL,
-	ALARM_PROGRAM,
-	ALARM_DISPLAY,
-	ALARM_AUDIO
-};
-
-enum AlarmUnit {
-	ALARM_MINUTES,
-	ALARM_HOURS,
-	ALARM_DAYS
-};
-
-#endif /* ALARM_ENUMS_H_INCLUDED */
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
index 6adb7104a5..7821ce8ca4 100644
--- a/calendar/cal-util/cal-util.h
+++ b/calendar/cal-util/cal-util.h
@@ -25,7 +25,7 @@
 #include <libgnome/gnome-defs.h>
 #include <time.h>
 #include <glib.h>
-#include "calobj.h"
+#include <cal-util/calobj.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/calendar/cal-util/icalendar.h b/calendar/cal-util/icalendar.h
index 09bfa06fad..2a22fbab71 100644
--- a/calendar/cal-util/icalendar.h
+++ b/calendar/cal-util/icalendar.h
@@ -2,7 +2,7 @@
 #define ICALENDAR_H
 
 #include <ical.h>
-#include "calobj.h"
+#include <cal-util/calobj.h>