r2563 - in trunk/src/target/OM-2007.2/panel-plugins: . openmoko-panel-battery openmoko-panel-bt openmoko-panel-clock openmoko-panel-gps openmoko-panel-gsm openmoko-panel-mainmenu openmoko-panel-usb
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Mon Jul 30 12:59:31 CEST 2007
Author: mickey
Date: 2007-07-30 12:59:29 +0200 (Mon, 30 Jul 2007)
New Revision: 2563
Removed:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/openmoko-panel-battery.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/openmoko-panel-usb.pro
trunk/src/target/OM-2007.2/panel-plugins/panel-plugins.pro
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/configure.ac
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/configure.ac
Log:
* import panel plugins into OM-2007.2
* remove qmake build system leftovers
* fix build system to use libmokopanelui2
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/ChangeLog 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,3 +1,8 @@
+2007-07-30 Michael Lauer <mickey at openmoko.org>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
2007-06-22 Stefan Schmidt <stefan at openmoko.org>
* configure.ac:
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/configure.ac 2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/openmoko-panel-battery.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/openmoko-panel-battery.pro 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-battery/openmoko-panel-battery.pro 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-battery.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/ChangeLog 2007-07-30 10:59:29 UTC (rev 2563)
@@ -0,0 +1,5 @@
+2007-07-30 Michael Lauer <mickey at openmoko.org>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/configure.ac 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/configure.ac 2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/openmoko-panel-bt.pro 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-bt.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/ChangeLog 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/ChangeLog 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,3 +1,8 @@
+2007-07-30 Michael Lauer <mickey at openmoko.org>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
2007-06-22 Stefan Schmidt <stefan at openmoko.org>
* configure.ac:
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/configure.ac 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/configure.ac 2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-clock.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/ChangeLog 2007-07-30 10:59:29 UTC (rev 2563)
@@ -0,0 +1,5 @@
+2007-07-30 Michael Lauer <mickey at openmoko.org>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/configure.ac 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/configure.ac 2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gps/openmoko-panel-gps.pro 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-gps.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog 2007-07-30 10:59:29 UTC (rev 2563)
@@ -0,0 +1,5 @@
+2007-07-30 Michael Lauer <mickey at openmoko.org>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/configure.ac 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/configure.ac 2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.3,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.3 not installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/openmoko-panel-gsm.pro 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,6 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-SOURCES = src/openmoko-panel-gsm.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/ChangeLog 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/ChangeLog 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,3 +1,8 @@
+2007-07-30 Michael Lauer <mickey at openmoko.org>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
2007-06-24 Stefan Schmidt <stefan at openmoko.org>
* src/buttonactions.c:
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/configure.ac 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/configure.ac 2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
PKG_CHECK_MODULES(LIBMB, libmb,,
AC_MSG_ERROR([matchbox-lib required]))
PKG_CHECK_MODULES(LIBSN, libstartup-notification-1.0, ,
Deleted: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,20 +0,0 @@
-MOKOCONFIG = mokoui
-MOKOTYPE = panel-plugin
-
-HEADERS = \
- src/buttonactions.h \
- src/mokodesktop.h \
- src/mokodesktop_item.h \
- src/stylusmenu.h
-
-SOURCES = \
- src/openmoko-panel-mainmenu.c \
- src/buttonactions.c \
- src/mokodesktop.c \
- src/mokodesktop_item.c \
- src/stylusmenu.c
-
-PKGCONFIG += libstartup-notification-1.0
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
-
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/ChangeLog 2007-07-30 10:59:29 UTC (rev 2563)
@@ -0,0 +1,5 @@
+2007-07-30 Michael Lauer <mickey at openmoko.org>
+
+ * configure.ac:
+ Import panel-plugin into 2007.2 and refer to libmokopanelui2.
+
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/configure.ac 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/configure.ac 2007-07-30 10:59:29 UTC (rev 2563)
@@ -11,8 +11,7 @@
AC_PROG_LIBTOOL
# base deps
-PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.2,,
- AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.2 not installed ***]))
+PKG_CHECK_MODULES(OPENMOKO, libmokopanelui2)
LIBS="$LIBS $OPENMOKO_LIBS"
CFLAGS="$CFLAGS $OPENMOKO_CFLAGS"
Deleted: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/openmoko-panel-usb.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/openmoko-panel-usb.pro 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-usb/openmoko-panel-usb.pro 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,5 +0,0 @@
-MOKOCONFIG = mokoui
-
-SOURCES = src/openmoko-panel-usb.c
-
-include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Deleted: trunk/src/target/OM-2007.2/panel-plugins/panel-plugins.pro
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/panel-plugins.pro 2007-07-30 10:46:34 UTC (rev 2562)
+++ trunk/src/target/OM-2007.2/panel-plugins/panel-plugins.pro 2007-07-30 10:59:29 UTC (rev 2563)
@@ -1,9 +0,0 @@
-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