aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-client
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@helixcode.com>2000-04-17 03:25:56 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-04-17 03:25:56 +0800
commit75f8b00ea05e5485530fb4a74af7e9afdf5345ae (patch)
treeb74f223155112d6ae34b554183a500a6e801b7f2 /calendar/cal-client
parent98a15f353372d37e48f5c925c91aa2f40cbb942a (diff)
downloadgsoc2013-evolution-75f8b00ea05e5485530fb4a74af7e9afdf5345ae.tar.gz
gsoc2013-evolution-75f8b00ea05e5485530fb4a74af7e9afdf5345ae.tar.zst
gsoc2013-evolution-75f8b00ea05e5485530fb4a74af7e9afdf5345ae.zip
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
Diffstat (limited to 'calendar/cal-client')
-rw-r--r--calendar/cal-client/Makefile.am12
-rw-r--r--calendar/cal-client/client-test.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index a114d589bd..1457ca9e7a 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -29,7 +29,7 @@ INCLUDES = \
lib_LTLIBRARIES = libcal-client.la
-libcal_clientincludedir = $(includedir)/cal-client
+libcal_clientincludedir = $(includedir)/evolution/cal-client
libcal_client_la_SOURCES = \
$(CORBA_GENERATED) \
@@ -54,9 +54,9 @@ client_test_INCLUDES = \
$(INCLUDES) \
-DG_LOG_DOMAIN=\"client-test\"
-client_test_LDADD = \
- $(BONOBO_VFS_GNOME_LIBS) \
- $(top_builddir)/calendar/cal-util/libcalutil.la \
- $(top_builddir)/libversit/libversit.la \
- $(top_builddir)/libical/src/libical/libical.la \
+client_test_LDADD = \
+ $(BONOBO_VFS_GNOME_LIBS) \
+ $(top_builddir)/calendar/cal-util/libcal-util.la \
+ $(top_builddir)/libversit/libversit.la \
+ $(top_builddir)/libical/src/libical/libical.la \
libcal-client.la
diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c
index d2374db275..28acee4802 100644
--- a/calendar/cal-client/client-test.c
+++ b/calendar/cal-client/client-test.c
@@ -1,7 +1,7 @@
#include <config.h>
#include <libgnorba/gnorba.h>
#include <bonobo.h>
-#include "cal-client.h"
+#include <cal-client/cal-client.h>
static CalClient *client1;
static CalClient *client2;