r3939 - in trunk/src/target/OM-2007.2/applications/openmoko-launcher: . src

[chris at sita.openmoko.org]

Author: chris
Date: 2008-01-24 13:35:02 +0100 (Thu, 24 Jan 2008)
New Revision: 3939

Added:
   trunk/src/target/OM-2007.2/applications/openmoko-launcher/src/Makefile.am
Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-launcher/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-launcher/src/launcher-main.c
Log:
        * src/Makefile.am:
        * src/launcher-main.c: (main):
        Fix building and make task manager work


Modified: trunk/src/target/OM-2007.2/applications/openmoko-launcher/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-launcher/ChangeLog	2008-01-24 12:28:08 UTC (rev 3938)
+++ trunk/src/target/OM-2007.2/applications/openmoko-launcher/ChangeLog	2008-01-24 12:35:02 UTC (rev 3939)
@@ -0,0 +1,6 @@
+2008-01-24  Chris Lord  <chris at openedhand.com>
+
+	* src/Makefile.am:
+	* src/launcher-main.c: (main):
+	Fix building and make task manager work
+

Added: trunk/src/target/OM-2007.2/applications/openmoko-launcher/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-launcher/src/Makefile.am	2008-01-24 12:28:08 UTC (rev 3938)
+++ trunk/src/target/OM-2007.2/applications/openmoko-launcher/src/Makefile.am	2008-01-24 12:35:02 UTC (rev 3939)
@@ -0,0 +1,30 @@
+INCLUDES = -I$(top_srcdir)
+
+AM_CPPFLAGS  = -DPKGDATADIR=\"$(pkgdatadir)\" 				\
+	       -DTODAY_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	       -DDATADIR=\""$(datadir)"\" -D_GNU_SOURCE
+
+AM_CFLAGS    = -Wall -pedantic -std=c99 @GTK_CFLAGS@ @MOKOUI_CFLAGS@
+
+bin_PROGRAMS = openmoko-launcher
+
+openmoko_launcher_SOURCES =		\
+	launcher-main.c 		\
+	launcher.h			\
+	today.h				\
+	today-utils.c			\
+	today-utils.h			\
+	today-task-manager.c		\
+	today-task-manager.h
+
+openmoko_launcher_LDADD  = \
+			$(top_builddir)/libtaku/libtaku.a	\
+			@GTK_LIBS@ @SN_LIBS@ @MOKOUI_LIBS@
+
+# Optional inotify support
+if HAVE_INOTIFY
+openmoko_launcher_LDADD += $(top_builddir)/libtaku/libinotify.a
+endif
+
+MAINTAINERCLEANFILES  = config.h.in Makefile.in
+

Modified: trunk/src/target/OM-2007.2/applications/openmoko-launcher/src/launcher-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-launcher/src/launcher-main.c	2008-01-24 12:28:08 UTC (rev 3938)
+++ trunk/src/target/OM-2007.2/applications/openmoko-launcher/src/launcher-main.c	2008-01-24 12:35:02 UTC (rev 3939)
@@ -43,7 +43,12 @@
 int
 main (int argc, char **argv)
 {
+	GOptionContext *context;
 	LauncherData data;
+	GtkWidget *widget;
+#ifndef STANDALONE
+	gint x, y, w, h;
+#endif
 	
 	static GOptionEntry entries[] = {
 		{ NULL }