r1468 - in trunk/src/target/OM-2007/panel-plugins: . openmoko-panel-bt openmoko-panel-clock/data openmoko-panel-gps openmoko-panel-gsm openmoko-panel-mainmenu openmoko-panel-mainmenu/data openmoko-panel-usb
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Thu Mar 22 01:26:04 CET 2007
Author: mickey
Date: 2007-03-22 01:26:02 +0100 (Thu, 22 Mar 2007)
New Revision: 1468
Removed:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gprs/
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-phone/
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/configure.ac
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-usb/configure.ac
trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
Log:
openmoko panel-plugins: misc. cleanups
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro 2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,4 +1,5 @@
MOKOCONFIG = mokoui
+MOKOTYPE = panel-plugin
SOURCES = src/openmoko-panel-bt.c
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/data/Makefile.am 2007-03-22 00:26:02 UTC (rev 1468)
@@ -5,15 +5,3 @@
#
resourcedir = $(pkgdatadir)
resource_DATA = clock-bg.png
-
-#
-# desktop integration: .desktop file
-#
-#desktopdir = $(datadir)/applications
-#dist_desktop_DATA = openmoko-panel-clock.desktop
-
-#
-# desktop integration: application icon
-#
-#appicondir = $(datadir)/icons
-#dist_appicon_DATA = clock-bg.png
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro 2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,4 +1,5 @@
MOKOCONFIG = mokoui
+MOKOTYPE = panel-plugin
SOURCES = src/openmoko-panel-gps.c
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/configure.ac 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/configure.ac 2007-03-22 00:26:02 UTC (rev 1468)
@@ -17,7 +17,7 @@
PKG_CHECK_MODULES(LIBGSMD, libgsmd,,
exit)
-LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS"
+LIBS="$LIBS $OPENMOKO_LIBS $LIBGSMD_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS"
# output stuff
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro 2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,4 +1,5 @@
MOKOCONFIG = mokoui
+MOKOTYPE = panel-plugin
SOURCES = src/openmoko-panel-gsm.c
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/data/Makefile.am 2007-03-22 00:26:02 UTC (rev 1468)
@@ -5,14 +5,3 @@
#
resourcedir = $(pkgdatadir)
resource_DATA = btn_menu.png
-#
-# desktop integration: .desktop file
-#
-#desktopdir = $(datadir)/applications
-#dist_desktop_DATA = openmoko-panel-mainmenu.desktop
-
-#
-# desktop integration: application icon
-#
-#appicondir = $(datadir)/icons
-#dist_appicon_DATA =
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro 2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,5 +1,5 @@
+MOKOCONFIG = mokoui
MOKOTYPE = panel-plugin
-MOKOCONFIG = mokoui
SOURCES = \
src/openmoko-panel-mainmenu.c
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-usb/configure.ac
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-usb/configure.ac 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-usb/configure.ac 2007-03-22 00:26:02 UTC (rev 1468)
@@ -14,12 +14,9 @@
PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not installed ***]))
-PKG_CHECK_MODULES(LIBGSMD, libgsmd,,
- exit)
+LIBS="$LIBS $OPENMOKO_LIBS"
+CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
-LIBS="$LIBS $GTK_LIBS $LIBGSMD_LIBS"
-CFLAGS="$CFLAGS $OPENMOKO_CFLAGS $LIBGSMD_CFLAGS"
-
# output stuff
AC_OUTPUT([
Makefile
Modified: trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro 2007-03-22 00:22:08 UTC (rev 1467)
+++ trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro 2007-03-22 00:26:02 UTC (rev 1468)
@@ -1,6 +1,9 @@
TEMPLATE = subdirs
SUBDIRS = \
openmoko-panel-battery \
+ openmoko-panel-bt \
openmoko-panel-clock \
+ openmoko-panel-gps \
+ openmoko-panel-gsm \
openmoko-panel-mainmenu
More information about the commitlog
mailing list