r2837 - in trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2: . images po src

abraxa at sita.openmoko.org abraxa at sita.openmoko.org
Tue Aug 28 10:47:01 CEST 2007 

Author: abraxa
Date: 2007-08-28 10:46:55 +0200 (Tue, 28 Aug 2007)
New Revision: 2837

Added:
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-left.png
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-right.png
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/LINGUAS
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/POTFILES.in
Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/Makefile.am
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
   trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/Makefile.am
Log:
Fixed some build issues



Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/Makefile.am	2007-08-28 01:36:21 UTC (rev 2836)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/Makefile.am	2007-08-28 08:46:55 UTC (rev 2837)
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src images intl
-# po
+SUBDIRS = images src po
+#intl
 
 
 EXTRA_DIST = openmoko-mediaplayer.desktop openmoko-mediaplayer.png

Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac	2007-08-28 01:36:21 UTC (rev 2836)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/configure.ac	2007-08-28 08:46:55 UTC (rev 2837)
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(openmoko-mediaplayer, 0.0.1, http://openmoko.org)
+AC_INIT(openmoko-mediaplayer2, 0.0.1, http://openmoko.org)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/main.c)
 AM_CONFIG_HEADER(config.h)
@@ -10,16 +10,14 @@
 AC_PROG_CXX
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
+AC_PROG_INSTALL
 
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.12.1])
+GETTEXT_PACKAGE=openmoko-mediaplayer2
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+AC_SUBST(GETTEXT_PACKAGE)
+AM_GLIB_GNU_GETTEXT
 
 
-CFLAGS="-I${prefix}/include $CFLAGS"
-AC_SUBST(CFLAGS)
-CPPFLAGS="-I${prefix}/include $CPPFLAGS"
-AC_SUBST(CPPFLAGS)
-
 # Check for GTK/GLib/GThread/Pango, dbus, OpenMoko libs, gstreamer, expat, uriparser and XSPF
 
 PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0 gtk+-2.0 >= 2.4.0 gthread-2.0 pango],,
@@ -28,26 +26,26 @@
 PKG_CHECK_MODULES(DBUS, [dbus-glib-1 >= 0.23.4],,
 	AC_MSG_ERROR([*** Cannot find dbus-glib-1 ***]))
 
-#PKG_CHECK_MODULES(OPENMOKO, [openmoko-libs >= 0.0.1],,
-#	AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
+# We just check for libmokoui2 for now (down below)
+#PKG_CHECK_MODULES(OPENMOKO, [openmoko-libs >= 0.1.0],,
+#	AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.1.0 not installed ***]))
 
 PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10 >= 0.10],,
 	AC_MSG_ERROR([*** Cannot find gstreamer ***]))
 
-LIBS="-lexpat -L${prefix}/lib $LIBS"
-AC_CHECK_LIB(expat, XML_Parse, [], [echo "Error: libexpat not found"; exit -1])
+LIBS="-lexpat $LIBS"
+AC_CHECK_LIB(expat, XML_Parse, , [echo "Error: libexpat not found"; exit -1])
 
 LIBS="-luriparser $LIBS"
-AC_CHECK_LIB(uriparser, uriParseUriW, [], [echo "Error: liburiparser not found"; exit -1])
+AC_CHECK_LIB(uriparser, uriParseUriW, , [echo "Error: liburiparser not found"; exit -1])
 
 LIBS="-lspiff $LIBS"
-AC_CHECK_LIB(spiff, spiff_parse, [], [echo "Error: XSPF library (libspiff) not found"; exit -1])
+AC_CHECK_LIB(spiff, spiff_parse, , [echo "Error: XSPF library (libspiff) not found"; exit -1])
 
 LIBS="-lmokoui2 $LIBS"
-AC_CHECK_LIB(mokoui2, moko_stock_register, [], [echo "Error: libmokoui2 not found"; exit -1])
+AC_CHECK_LIB(mokoui2, moko_stock_register, , [echo "Error: libmokoui2 not found"; exit -1])
 
 
-
 LIBS="$GTK_LIBS $OPENMOKO_LIBS $GSTREAMER_LIBS $LIBS"
 CFLAGS="$OPENMOKO_CFLAGS $GSTREAMER_CFLAGS $CFLAGS"
 
@@ -62,6 +60,5 @@
     src/Makefile
     images/Makefile
     po/Makefile.in
-    intl/Makefile
 ])
 AC_OUTPUT

Added: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-left.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-left.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-right.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/images/ico-balance-right.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/LINGUAS
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/LINGUAS	2007-08-28 01:36:21 UTC (rev 2836)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/LINGUAS	2007-08-28 08:46:55 UTC (rev 2837)
@@ -0,0 +1 @@
+# No languages available at this point

Added: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/POTFILES.in
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/POTFILES.in	2007-08-28 01:36:21 UTC (rev 2836)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/po/POTFILES.in	2007-08-28 08:46:55 UTC (rev 2837)
@@ -0,0 +1,11 @@
+# List of source files containing translatable strings.
+
+src/editor_page.c
+src/files_page.c
+src/guitools.c
+src/main.c
+src/main_page.c
+src/persistent.c
+src/playback.c
+src/playlist_page.c
+src/playlist.c

Modified: trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/Makefile.am	2007-08-28 01:36:21 UTC (rev 2836)
+++ trunk/src/target/OM-2007.2/applications/openmoko-mediaplayer2/src/Makefile.am	2007-08-28 08:46:55 UTC (rev 2837)
@@ -11,7 +11,7 @@
         $(DBUS_CFLAGS) \
         $(OPENMOKO_CFLAGS) \
 	$(OMP_DEFINES) \
-	-I${top_srcdir}/intl -Wall -pedantic -std=c99
+	-I../intl -I${top_srcdir}/intl -Wall -pedantic -std=c99
 
 openmoko_mediaplayer_CPPFLAGS = \
 	-Wall -pedantic

More information about the commitlog mailing list