r3324 - in trunk/src/target/OM-2007.2/applications/openmoko-today2: . src

[ross at sita.openmoko.org]

Author: ross
Date: 2007-11-01 18:09:18 +0100 (Thu, 01 Nov 2007)
New Revision: 3324

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-today2/
   trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-today2/configure.ac
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/Makefile.am
   trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
Log:
2007-11-01  Ross Burton  <ross at openedhand.com>

	* .:
	Update lock down svn:externals to revisions.

	* src/:
	Remove inotify externals, its in libtaku now.
	
	* configure.ac:
	* src/Makefile.am:
	* src/today-launcher.c:
	Update for those changes.



Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-today2
___________________________________________________________________
Name: svn:externals
   - libkoto http://svn.o-hand.com/repos/tasks/trunk/libkoto
libtaku http://svn.o-hand.com/repos/matchbox/trunk/matchbox-desktop-2/libtaku

   + libkoto -r346 http://svn.o-hand.com/repos/tasks/trunk/libkoto
libtaku -r1765 http://svn.o-hand.com/repos/matchbox/trunk/matchbox-desktop-2/libtaku


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-11-01 16:48:28 UTC (rev 3323)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog	2007-11-01 17:09:18 UTC (rev 3324)
@@ -1,3 +1,16 @@
+2007-11-01  Ross Burton  <ross at openedhand.com>
+
+	* .:
+	Update lock down svn:externals to revisions.
+
+	* src/:
+	Remove inotify externals, its in libtaku now.
+	
+	* configure.ac:
+	* src/Makefile.am:
+	* src/today-launcher.c:
+	Update for those changes.
+
 2007-10-26  Chris Lord  <chris at openedhand.com>
 
 	* src/today-task-manager.c: (today_task_manager_raise_clicked_cb):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/configure.ac	2007-11-01 16:48:28 UTC (rev 3323)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/configure.ac	2007-11-01 17:09:18 UTC (rev 3324)
@@ -26,6 +26,9 @@
 
 AC_CHECK_HEADERS([sys/inotify.h], inotify_support=yes, inotify_support=no)
 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"])
+if test x$inotify_support = xyes; then
+        AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled])
+fi
 
 PKG_CHECK_MODULES(SEXY, libsexy,
                   [enable_sexy=yes


Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-today2/src
___________________________________________________________________
Name: svn:externals
   - inotify http://svn.o-hand.com/repos/matchbox/trunk/matchbox-desktop-2/src/inotify


Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/Makefile.am	2007-11-01 16:48:28 UTC (rev 3323)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/Makefile.am	2007-11-01 17:09:18 UTC (rev 3324)
@@ -34,17 +34,7 @@
 
 # Optional inotify support
 if HAVE_INOTIFY
-AM_CPPFLAGS += -DWITH_INOTIFY
-openmoko_today_LDADD += libinotify.a
-
-noinst_LIBRARIES = libinotify.a
-libinotify_a_SOURCES = \
-	inotify/inotify-kernel.c inotify/inotify-kernel.h \
-	inotify/inotify-sub.c   inotify/inotify-sub.h \
-	inotify/inotify-path.c inotify/inotify-path.h \
-	inotify/inotify-missing.c inotify/inotify-missing.h \
-	inotify/inotify-diag.c inotify/inotify-diag.h \
-	inotify/local_inotify.h inotify/local_inotify_syscalls.h
+openmoko_today_LDADD += $(top_builddir)/libtaku/libinotify.a
 endif
 
 MAINTAINERCLEANFILES  = config.h.in Makefile.in

Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c	2007-11-01 16:48:28 UTC (rev 3323)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-launcher.c	2007-11-01 17:09:18 UTC (rev 3324)
@@ -16,8 +16,8 @@
 
 /* inotify support derived/copied from code in matchbox-desktop-2 */
 #if WITH_INOTIFY
-#include "inotify/inotify-path.h"
-#include "inotify/local_inotify.h"
+#include "libtaku/inotify/inotify-path.h"
+#include "libtaku/inotify/local_inotify.h"
 
 static gboolean with_inotify;
 G_LOCK_DEFINE(inotify_lock);