r1048 - in trunk/src/target/OM-2007/applications/openmoko-mainmenu: . src

[mickey at sita.openmoko.org]

Author: mickey
Date: 2007-02-20 01:33:25 +0100 (Tue, 20 Feb 2007)
New Revision: 1048

Modified:
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
Log:
openmoko-mainmenu: make it build. See #184 and please ACT ASAP!


Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac	2007-02-20 00:26:54 UTC (rev 1047)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/configure.ac	2007-02-20 00:33:25 UTC (rev 1048)
@@ -13,9 +13,13 @@
 # base deps
 PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
                  AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
-LIBS="$LIBS $GTK_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
 
+PKG_CHECK_MODULES(LIBMB, libmb >= 1.8,,
+                 AC_MSG_ERROR([*** You need to install libmatchbox >= 1.8***]))
+
+LIBS="$LIBS $OPENMOKO_LIBS $LIBMB_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBMB_CFLAGS"
+
 # output stuff
 AC_OUTPUT([
 Makefile

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am	2007-02-20 00:26:54 UTC (rev 1047)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/Makefile.am	2007-02-20 00:33:25 UTC (rev 1048)
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
               -DPKGDATADIR=\"$(pkgdatadir)\"
-AM_CFLAGS = -Wall -std=c99 -pedantic @OPENMOKO_CFLAGS@
+AM_CFLAGS = -Wall -std=c99 @OPENMOKO_CFLAGS@ @LIBMB_CFLAGS@
 
 bin_PROGRAMS = openmoko-mainmenu
 
@@ -10,5 +10,5 @@
 			   callbacks.c app-history.c
 
 
-openmoko_mainmenu_LDADD = @OPENMOKO_LIBS@
+openmoko_mainmenu_LDADD = @OPENMOKO_LIBS@ @LIBMB_LIBS@
 

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h	2007-02-20 00:26:54 UTC (rev 1047)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokodesktop.h	2007-02-20 00:33:25 UTC (rev 1048)
@@ -15,7 +15,7 @@
 
 #include <libmb/mb.h>
 
-#define VFOLDERDIR 		"/usr/share/matchbox"
+#define VFOLDERDIR 		"/usr/local/share/matchbox"
 #define DD_DIR 		 	"/usr/share/applications/" 
 
 /* #define DD_DIR "/tmp/" */