[maemo-commits] [maemo-commits] r19012 - in projects/haf/trunk/hildon-input-method-plugins-example: . src

[From: subversion at stage.maemo.org]

Author: murrayc
Date: 2009-07-31 14:20:52 +0300 (Fri, 31 Jul 2009)
New Revision: 19012

Modified:
   projects/haf/trunk/hildon-input-method-plugins-example/ChangeLog
   projects/haf/trunk/hildon-input-method-plugins-example/README
   projects/haf/trunk/hildon-input-method-plugins-example/configure.ac
   projects/haf/trunk/hildon-input-method-plugins-example/src/Makefile.am
Log:
2009-06-23  Murray Cumming  <murrayc at murrayc.com>

* README: Added a link to the live.gnome.org page, as in hildon-input-method.
* configure.ac:
* src/Makefile.am: Use just one _CFLAGS/_LIBS variable. There is no need
for separate checks. This is simpler.

Modified: projects/haf/trunk/hildon-input-method-plugins-example/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method-plugins-example/ChangeLog	2009-07-31 09:03:46 UTC (rev 19011)
+++ projects/haf/trunk/hildon-input-method-plugins-example/ChangeLog	2009-07-31 11:20:52 UTC (rev 19012)
@@ -1,3 +1,10 @@
+2009-06-23  Murray Cumming  <murrayc at murrayc.com>
+
+	* README: Added a link to the live.gnome.org page, as in hildon-input-method.
+	* configure.ac:
+	* src/Makefile.am: Use just one _CFLAGS/_LIBS variable. There is no need 
+	for separate checks. This is simpler.
+
 2008-01-11  Richard Sun  <richard.sun at nokia.com>
 
 	* Version 2.0.0:

Modified: projects/haf/trunk/hildon-input-method-plugins-example/README
===================================================================
--- projects/haf/trunk/hildon-input-method-plugins-example/README	2009-07-31 09:03:46 UTC (rev 19011)
+++ projects/haf/trunk/hildon-input-method-plugins-example/README	2009-07-31 11:20:52 UTC (rev 19012)
@@ -0,0 +1 @@
+Visit http://live.gnome.org/Hildon/HildonInputMethod

Modified: projects/haf/trunk/hildon-input-method-plugins-example/configure.ac
===================================================================
--- projects/haf/trunk/hildon-input-method-plugins-example/configure.ac	2009-07-31 09:03:46 UTC (rev 19011)
+++ projects/haf/trunk/hildon-input-method-plugins-example/configure.ac	2009-07-31 11:20:52 UTC (rev 19012)
@@ -8,17 +8,12 @@
 AC_PROG_LIBTOOL 
 AC_HEADER_STDC
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0 gconf-2.0 > 2.0)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
+PKG_CHECK_MODULES(HIM_PLUGINS_EXAMPLE, 
+  hildon-input-method-framework-3.0 >= 1.99.0 hildon-input-method-ui-3.0 >= 1.99.0 
+  gtk+-2.0 >= 2.4.0 gconf-2.0 > 2.0
+  dbus-1 >= 0.60)
+AC_SUBST(HIM_PLUGINS_EXAMPLE_CFLAGS)
+AC_SUBST(HIM_PLUGINS_EXAMPLE_LIBS)
 
-PKG_CHECK_MODULES(HIM, hildon-input-method-framework-3.0 >= 1.99.0 hildon-input-method-ui-3.0 >= 1.99.0)
-AC_SUBST(HIM_CFLAGS)
-AC_SUBST(HIM_LIBS)
-
-PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.60)
-AC_SUBST(DBUS_LIBS)
-AC_SUBST(DBUS_CFLAGS)
-
 AC_OUTPUT([ Makefile src/Makefile])
 

Modified: projects/haf/trunk/hildon-input-method-plugins-example/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-input-method-plugins-example/src/Makefile.am	2009-07-31 09:03:46 UTC (rev 19011)
+++ projects/haf/trunk/hildon-input-method-plugins-example/src/Makefile.am	2009-07-31 11:20:52 UTC (rev 19012)
@@ -1,11 +1,13 @@
-INCLUDES = \
-	$(GTK_CFLAGS) \
-	$(HIM_CFLAGS) $(DBUS_CFLAGS) 
+INCLUDES = $(HIM_PLUGINS_EXAMPLE_CFLAGS)
 
+# Install the plugin (shared library) in, for instance,
+# /usr/lib/hildon-input-method/, where it will be found by the 
+# hildon-input-method framework:
 implugindir = $(libdir)/hildon-input-method
 implugin_LTLIBRARIES = him_vkb_example.la
 
+# Build the plugin (shared library):
 him_vkb_example_la_SOURCES = him-vkb-example.c
-him_vkb_example_la_LIBADD = $(GTK_LIBS) $(HIM_LIBS) 
+him_vkb_example_la_LIBADD = $(HIM_PLUGINS_EXAMPLE_LIBS)
 him_vkb_example_la_LDFLAGS = -avoid-version -module