Install libempathy and libempathy-gtk and make their API public.

2007-06-22 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/libempathy-gtk.pc.in:
	* libempathy-gtk/Makefile.am:
	* libempathy/libempathy.pc.in:
	* libempathy/Makefile.am:
	* configure.ac: Install libempathy and libempathy-gtk and make their
	API public.


svn path=/trunk/; revision=172

6 files changed, 152 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 46a882947..a17214689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2007-06-22 Xavier Claessens  <xclaesse@gmail.com>
 
+	* libempathy-gtk/libempathy-gtk.pc.in:
+	* libempathy-gtk/Makefile.am:
+	* libempathy/libempathy.pc.in:
+	* libempathy/Makefile.am:
+	* configure.ac: Install libempathy and libempathy-gtk and make their
+	API public.
+
+2007-06-22 Xavier Claessens  <xclaesse@gmail.com>
+
 	* po/POTFILES.in: s/gossip/empathy/
 
 2007-06-22 Xavier Claessens  <xclaesse@gmail.com>
diff --git a/configure.ac b/configure.ac
index 837cb1d9e..22fce88dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,9 @@ AC_OUTPUT([
   data/scalable/Makefile
   po/Makefile.in
   libempathy/Makefile
+  libempathy/libempathy.pc
   libempathy-gtk/Makefile
+  libempathy-gtk/libempathy-gtk.pc
   src/Makefile
 ])
 
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 5a01c6471..8e7ef602f 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -5,48 +5,80 @@ AM_CPPFLAGS =                                           \
 	$(EMPATHY_CFLAGS)				\
 	$(WARN_CFLAGS)
 
-noinst_LTLIBRARIES = libempathy-gtk.la
+lib_LTLIBRARIES = libempathy-gtk.la
 
-libempathy_gtk_la_SOURCES =             					\
-	ephy-spinner.c				ephy-spinner.h			\
-	empathy-images.h							\
-	empathy-main-window.c			empathy-main-window.h		\
-	empathy-status-icon.c			empathy-status-icon.h		\
-	empathy-contact-widget.c		empathy-contact-widget.h	\
-	empathy-contact-dialogs.c		empathy-contact-dialogs.h	\
-	empathy-accounts-dialog.c		empathy-accounts-dialog.h	\
-	empathy-account-widget-generic.c		empathy-account-widget-generic.h	\
-	empathy-account-widget-jabber.c		empathy-account-widget-jabber.h	\
-	empathy-profile-chooser.c		empathy-profile-chooser.h	\
-	empathy-cell-renderer-expander.c		empathy-cell-renderer-expander.h	\
-	empathy-cell-renderer-text.c		empathy-cell-renderer-text.h	\
-	empathy-spell.c				empathy-spell.h			\
-	empathy-spell-dialog.c			empathy-spell-dialog.h		\
-	empathy-contact-groups.c			empathy-contact-groups.h		\
-	empathy-contact-list-store.c		empathy-contact-list-store.h	\
-	empathy-contact-list-view.c		empathy-contact-list-view.h	\
-	empathy-preferences.c			empathy-preferences.h		\
-	empathy-theme-manager.c			empathy-theme-manager.h		\
-	empathy-chat-window.c			empathy-chat-window.h		\
-	empathy-chat.c				empathy-chat.h			\
-	empathy-chat-view.c			empathy-chat-view.h		\
-	empathy-private-chat.c			empathy-private-chat.h		\
-	empathy-group-chat.c			empathy-group-chat.h		\
-	empathy-geometry.c			empathy-geometry.h		\
-	empathy-status-presets.c			empathy-status-presets.h		\
-	empathy-presence-chooser.c		empathy-presence-chooser.h	\
-	empathy-about-dialog.c			empathy-about-dialog.h		\
-	empathy-account-chooser.c		empathy-account-chooser.h	\
-	empathy-new-chatroom-dialog.c		empathy-new-chatroom-dialog.h	\
-	empathy-chatrooms-window.c		empathy-chatrooms-window.h	\
-	empathy-log-window.c			empathy-log-window.h		\
-	empathy-ui-utils.c			empathy-ui-utils.h
+libempathy_gtk_la_SOURCES =             	\
+	ephy-spinner.c	ephy-spinner.h		\
+	empathy-main-window.c			\
+	empathy-status-icon.c			\
+	empathy-contact-widget.c		\
+	empathy-contact-dialogs.c		\
+	empathy-accounts-dialog.c		\
+	empathy-account-widget-generic.c	\
+	empathy-account-widget-jabber.c		\
+	empathy-profile-chooser.c		\
+	empathy-cell-renderer-expander.c	\
+	empathy-cell-renderer-text.c		\
+	empathy-spell.c				\
+	empathy-spell-dialog.c			\
+	empathy-contact-groups.c		\
+	empathy-contact-list-store.c		\
+	empathy-contact-list-view.c		\
+	empathy-preferences.c			\
+	empathy-theme-manager.c			\
+	empathy-chat-window.c			\
+	empathy-chat.c				\
+	empathy-chat-view.c			\
+	empathy-private-chat.c			\
+	empathy-group-chat.c			\
+	empathy-geometry.c			\
+	empathy-status-presets.c		\
+	empathy-presence-chooser.c		\
+	empathy-about-dialog.c			\
+	empathy-account-chooser.c		\
+	empathy-new-chatroom-dialog.c		\
+	empathy-chatrooms-window.c		\
+	empathy-log-window.c			\
+	empathy-ui-utils.c
 
-libempathy_gtk_la_LIBADD =				\
-	$(EMPATHY_LIBS)					\
+libempathy_gtk_la_LIBADD =			\
+	$(EMPATHY_LIBS)				\
 	$(top_builddir)/libempathy/libempathy.la
 
-libempathy_gtk_includedir = $(includedir)/empathy/
+libempathy_gtkdir = $(includedir)/libempathy-gtk/
+libempathy_gtk_HEADERS =			\
+	empathy-images.h			\
+	empathy-main-window.h			\
+	empathy-status-icon.h			\
+	empathy-contact-widget.h		\
+	empathy-contact-dialogs.h		\
+	empathy-accounts-dialog.h		\
+	empathy-account-widget-generic.h	\
+	empathy-account-widget-jabber.h		\
+	empathy-profile-chooser.h		\
+	empathy-cell-renderer-expander.h	\
+	empathy-cell-renderer-text.h		\
+	empathy-spell.h				\
+	empathy-spell-dialog.h			\
+	empathy-contact-groups.h		\
+	empathy-contact-list-store.h		\
+	empathy-contact-list-view.h		\
+	empathy-preferences.h			\
+	empathy-theme-manager.h			\
+	empathy-chat-window.h			\
+	empathy-chat.h				\
+	empathy-chat-view.h			\
+	empathy-private-chat.h			\
+	empathy-group-chat.h			\
+	empathy-geometry.h			\
+	empathy-status-presets.h		\
+	empathy-presence-chooser.h		\
+	empathy-about-dialog.h			\
+	empathy-account-chooser.h		\
+	empathy-new-chatroom-dialog.h		\
+	empathy-chatrooms-window.h		\
+	empathy-log-window.h			\
+	empathy-ui-utils.h
 
 gladedir = $(datadir)/empathy
 glade_DATA = 					\
@@ -59,10 +91,10 @@ glade_DATA = 					\
 	empathy-accounts-dialog.glade		\
 	empathy-account-widget-jabber.glade	\
 	empathy-new-chatroom-dialog.glade	\
-	empathy-group-chat.glade			\
+	empathy-group-chat.glade		\
 	empathy-chatrooms-window.glade		\
 	empathy-spell-dialog.glade		\
-	empathy-log-window.glade			\
+	empathy-log-window.glade		\
 	empathy-chat.glade
 
 dtddir = $(datadir)/empathy
@@ -70,6 +102,8 @@ dtd_DATA = 					\
 	empathy-status-presets.dtd		\
 	empathy-contact-groups.dtd
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libempathy-gtk.pc
 
 EXTRA_DIST =			\
 	$(glade_DATA)		\
diff --git a/libempathy-gtk/libempathy-gtk.pc.in b/libempathy-gtk/libempathy-gtk.pc.in
new file mode 100644
index 000000000..4cb8452df
--- /dev/null
+++ b/libempathy-gtk/libempathy-gtk.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libempathy
+Description:  Empathy interface library
+Requires: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, libmissioncontrol, libtelepathy, libempathy
+Version: @VERSION@
+Libs: -L${libdir} -lempathy-gtk
+Cflags: -I${includedir} 
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 00ce4233a..c30f62fa5 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -10,34 +10,54 @@ BUILT_SOURCES = 					\
 	empathy-marshal.c				\
 	empathy-chandler-glue.h
 
-noinst_LTLIBRARIES = libempathy.la
+lib_LTLIBRARIES = libempathy.la
 
-libempathy_la_SOURCES =             						\
-	empathy-conf.c			empathy-conf.h				\
-	empathy-contact.c		empathy-contact.h			\
-	empathy-avatar.c		empathy-avatar.h			\
-	empathy-time.c			empathy-time.h				\
-	empathy-presence.c		empathy-presence.h			\
-	empathy-debug.c			empathy-debug.h				\
-	empathy-utils.c			empathy-utils.h				\
-	empathy-message.c		empathy-message.h			\
-	empathy-chatroom-manager.c	empathy-chatroom-manager.h		\
-	empathy-chatroom.c		empathy-chatroom.h			\
-	empathy-contact-list.c		empathy-contact-list.h			\
-	empathy-contact-manager.c	empathy-contact-manager.h		\
-	empathy-tp-group.c		empathy-tp-group.h			\
-	empathy-tp-contact-list.c	empathy-tp-contact-list.h		\
-	empathy-tp-chat.c		empathy-tp-chat.h			\
-	empathy-tp-chatroom.c		empathy-tp-chatroom.h			\
-	empathy-chandler.c		empathy-chandler.h			\
-	empathy-idle.c			empathy-idle.h				\
-	empathy-log-manager.c		empathy-log-manager.h			\
+libempathy_la_SOURCES =					\
+	empathy-conf.c					\
+	empathy-contact.c				\
+	empathy-avatar.c				\
+	empathy-time.c					\
+	empathy-presence.c				\
+	empathy-debug.c					\
+	empathy-utils.c					\
+	empathy-message.c				\
+	empathy-chatroom-manager.c			\
+	empathy-chatroom.c				\
+	empathy-contact-list.c				\
+	empathy-contact-manager.c			\
+	empathy-tp-group.c				\
+	empathy-tp-contact-list.c			\
+	empathy-tp-chat.c				\
+	empathy-tp-chatroom.c				\
+	empathy-chandler.c				\
+	empathy-idle.c					\
+	empathy-log-manager.c				\
 	empathy-marshal-main.c
 
 libempathy_la_LIBADD =		\
 	$(LIBEMPATHY_LIBS)
 
-libempathy_includedir = $(includedir)/empathy/
+libempathydir = $(includedir)/libempathy/
+libempathy_HEADERS =				\
+	empathy-conf.h				\
+	empathy-contact.h			\
+	empathy-avatar.h			\
+	empathy-time.h				\
+	empathy-presence.h			\
+	empathy-debug.h				\
+	empathy-utils.h				\
+	empathy-message.h			\
+	empathy-chatroom-manager.h		\
+	empathy-chatroom.h			\
+	empathy-contact-list.h			\
+	empathy-contact-manager.h		\
+	empathy-tp-group.h			\
+	empathy-tp-contact-list.h		\
+	empathy-tp-chat.h			\
+	empathy-tp-chatroom.h			\
+	empathy-chandler.h			\
+	empathy-idle.h				\
+	empathy-log-manager.h
 
 %-marshal.h: %-marshal.list Makefile.am
 	$(GLIB_GENMARSHAL) --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
@@ -58,6 +78,9 @@ stylesheetdir = $(datadir)/empathy
 stylesheet_DATA =		\
 	empathy-log-manager.xsl
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libempathy.pc
+
 EXTRA_DIST = 			\
 	empathy-marshal.list	\
 	empathy-chandler.xml	\
diff --git a/libempathy/libempathy.pc.in b/libempathy/libempathy.pc.in
new file mode 100644
index 000000000..e567fefce
--- /dev/null
+++ b/libempathy/libempathy.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libempathy
+Description:  Empathy base library
+Requires: glib-2.0, gobject-2.0, libxml-2.0, libtelepathy, libmissioncontrol
+Version: @VERSION@
+Libs: -L${libdir} -lempathy
+Cflags: -I${includedir}