r4292 - in trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2008-04-01 21:46:30 +0200 (Tue, 01 Apr 2008)
New Revision: 4292

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/Makefile.am
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/Makefile.am
Log:
2008-04-01  Thomas Wood  <thomas at openedhand.com>

	* configure.ac:
	* src/Makefile.am:

	Bring in libhito for future use



Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-messages2
___________________________________________________________________
Name: svn:externals
   + libhito       http://svn.o-hand.com/repos/contacts/branches/hito/libhito



Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2008-04-01 17:09:42 UTC (rev 4291)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2008-04-01 19:46:30 UTC (rev 4292)
@@ -1,3 +1,10 @@
+2008-04-01  Thomas Wood  <thomas at openedhand.com>
+
+	* configure.ac:
+	* src/Makefile.am:
+
+	Bring in libhito for future use
+
 2008-04-01  Erin Yueh  <erin_yueh at openmoko.com>
 
 	* src/sms-dbus.c: (sms_dbus_send_message):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/Makefile.am	2008-04-01 17:09:42 UTC (rev 4291)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/Makefile.am	2008-04-01 19:46:30 UTC (rev 4292)
@@ -1 +1 @@
-SUBDIRS=src data
+SUBDIRS=libhito src data

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac	2008-04-01 17:09:42 UTC (rev 4291)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/configure.ac	2008-04-01 19:46:30 UTC (rev 4292)
@@ -17,6 +17,13 @@
 PKG_CHECK_MODULES(JANA, libjana libjana-ecal libjana-gtk)
 PKG_CHECK_MODULES(DBUS, dbus-glib-1)
 
+
+# CFLAGS and LIBS definitions for libhito
+CONTACTS_CFLAGS="$EBOOK_CFLAGS $GTK_CFLAGS"
+CONTACTS_LIBS="$EBOOK_LIBS $GTK_LIBS"
+AC_SUBST(CONTACTS_CFLAGS)
+AC_SUBST(CONTACTS_LIBS)
+
 old_cflags=$CFLAGS
 CFLAGS=$EBOOK_CFLAGS
 AC_CHECK_TYPE(EContactPhotoType, [], [], [#include <libebook/e-book.h>])
@@ -43,6 +50,7 @@
 
 AC_OUTPUT([
 Makefile
+libhito/Makefile
 src/Makefile
 data/Makefile
 ])

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/Makefile.am	2008-04-01 17:09:42 UTC (rev 4291)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/Makefile.am	2008-04-01 19:46:30 UTC (rev 4292)
@@ -1,6 +1,7 @@
+INCLUDES = -I$(top_srcdir)/libhito
 
 AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" $(GTK_CFLAGS) $(JANA_CFLAGS) $(MOKOUI_CFLAGS) $(EBOOK_CFLAGS) $(DBUS_CFLAGS) -Wall
-AM_LDFLAGS = $(GTK_LIBS) $(JANA_LIBS) $(MOKOUI_LIBS) $(EBOOK_LIBS) $(DBUS_LIBS)
+AM_LDFLAGS = $(GTK_LIBS) $(JANA_LIBS) $(MOKOUI_LIBS) $(EBOOK_LIBS) $(DBUS_LIBS) $(top_builddir)/libhito/libhito.a
 
 bin_PROGRAMS=openmoko-messages