LIBADD all the relevant libical libs

2003-11-05  JP Rosevear <jpr@ximian.com>

	* libecal/Makefile.am: LIBADD all the relevant libical libs

	* libecal/libecal-1.0.pc.in: no need to explicitly link
	libical-evolution

	* libedatacal/libedatacal-1.0.pc.in: ditto; fix include dir

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f6ebd66..0d2ca32 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-05  JP Rosevear <jpr@ximian.com>
+
+       * libecal/Makefile.am: LIBADD all the relevant libical libs
+
+       * libecal/libecal-1.0.pc.in: no need to explicitly link
+       libical-evolution
+
+       * libedatacal/libedatacal-1.0.pc.in: ditto; fix include dir
+       
 2003-11-05  Rodrigo Moya <rodrigo@ximian.com>
 
        * libedatacal/e-cal-backend-sexp.c: removed GAL dependency.

diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 88a2089..945c330 100644 (file)
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -52,8 +52,10 @@ libecal_la_SOURCES =         \
        e-cal-view.c            \
        e-cal-view-listener.c
 
-libecal_la_LIBADD =                                                    \
-       $(top_builddir)/calendar/libical/src/libical/libical-evolution.la\
+libecal_la_LIBADD =                                                                    \
+       $(top_builddir)/calendar/libical/src/libical/libical-evolution.la               \
+       $(top_builddir)/calendar/libical/src/libicalvcal/libicalvcal-evolution.la       \
+       $(top_builddir)/calendar/libical/src/libicalss/libicalss-evolution.la   \
        $(top_builddir)/libedataserver/libedataserver.la
 
 libecal_la_LDFLAGS =                                                           \

diff --git a/calendar/libecal/libecal-1.0.pc.in b/calendar/libecal/libecal-1.0.pc.in
index aced8e5..72a8e0b 100644 (file)
--- a/calendar/libecal/libecal-1.0.pc.in
+++ b/calendar/libecal/libecal-1.0.pc.in
@@ -6,12 +6,9 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
-privlibdir=@privlibdir@
-privincludedir=@privincludedir@
-
 Name: libedatacal
 Description: Backend library for evolution calendars
 Version: @VERSION@
 Requires: libgnome-2.0 libbonobo-2.0 libedataserver-1.0
-Libs: -L${libdir} -lecal -L${privlibdir} -lical-evolution
-Cflags: -I${includedir}/evolution-data-server-1.0 -I${privincludedir}
+Libs: -L${libdir} -lecal
+Cflags: -I${includedir}/evolution-data-server-1.0

diff --git a/calendar/libedata-cal/libedata-cal-1.0.pc.in b/calendar/libedata-cal/libedata-cal-1.0.pc.in
index 2351645..52fc98d 100644 (file)
--- a/calendar/libedata-cal/libedata-cal-1.0.pc.in
+++ b/calendar/libedata-cal/libedata-cal-1.0.pc.in
@@ -6,12 +6,9 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
-privlibdir=@privlibdir@
-privincludedir=@privincludedir@
-
 Name: libecal
 Description: Client library for evolution calendars
 Version: @VERSION@
 Requires: libgnome-2.0 libbonobo-2.0 gal-2.2 >= @GAL_REQUIRED@ gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
-Libs: -L${libdir} -ledatacal -L${privlibdir} -lical-evolution
-Cflags: -I${includedir/evolution-data-server-1.0} -I${privincludedir}/libical
+Libs: -L${libdir} -ledatacal -lecal
+Cflags: -I${includedir}/evolution-data-server-1.0

diff --git a/calendar/libedatacal/libedatacal-1.0.pc.in b/calendar/libedatacal/libedatacal-1.0.pc.in
index 2351645..52fc98d 100644 (file)
--- a/calendar/libedatacal/libedatacal-1.0.pc.in
+++ b/calendar/libedatacal/libedatacal-1.0.pc.in
@@ -6,12 +6,9 @@ includedir=@includedir@
 idldir=@idldir@
 IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
 
-privlibdir=@privlibdir@
-privincludedir=@privincludedir@
-
 Name: libecal
 Description: Client library for evolution calendars
 Version: @VERSION@
 Requires: libgnome-2.0 libbonobo-2.0 gal-2.2 >= @GAL_REQUIRED@ gnome-vfs-2.0 libedataserver-1.0 libecal-1.0
-Libs: -L${libdir} -ledatacal -L${privlibdir} -lical-evolution
-Cflags: -I${includedir/evolution-data-server-1.0} -I${privincludedir}/libical
+Libs: -L${libdir} -ledatacal -lecal
+Cflags: -I${includedir}/evolution-data-server-1.0