- link multikey, dvorak and keyboard input method against pickboard

  (and updated ipkg dependencies accordingly) , to avoid duplicated
  symbols at run-time (patch posted on opie list a couple of days ago)

6 files changed, 6 insertions, 18 deletions

diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro
index 5c14761..3236749 100644
--- a/inputmethods/dvorak/dvorak.pro
+++ b/inputmethods/dvorak/dvorak.pro
@@ -1,18 +1,14 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   dvorak.h \
-            ../pickboard/pickboardcfg.h \
-            ../pickboard/pickboardpicks.h \
             dvorakimpl.h 
         SOURCES=   dvorak.cpp \
-            ../pickboard/pickboardcfg.cpp \
-            ../pickboard/pickboardpicks.cpp \
             dvorakimpl.cpp
         TARGET  = qdvorak
         DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
-LIBS            += -lqpe
+LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
         VERSION         = 1.0.0
 
 TRANSLATIONS = ../../i18n/de/libqdvorak.ts \
diff --git a/inputmethods/dvorak/opie-dvorak.control b/inputmethods/dvorak/opie-dvorak.control
index 11a33b9..fcc9138 100644
--- a/inputmethods/dvorak/opie-dvorak.control
+++ b/inputmethods/dvorak/opie-dvorak.control
@@ -4,7 +4,7 @@ Section: opie/inputmethods
 Maintainer: Jeremy Cowgar <jc@cowgar.com>
 Architecture: arm
 Version: $QPE_VERSION-4
-Depends: opie-base ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION) opie-pickboard
 Description: Dvorak keyboard input method
  Dvorak keyboard input method for the Opie environment. This is
  based off of the original keyboard input method. Thanks be to
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro
index 105316f..540d177 100644
--- a/inputmethods/keyboard/keyboard.pro
+++ b/inputmethods/keyboard/keyboard.pro
@@ -1,18 +1,14 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   keyboard.h \
-            ../pickboard/pickboardcfg.h \
-            ../pickboard/pickboardpicks.h \
             keyboardimpl.h 
         SOURCES=   keyboard.cpp \
-            ../pickboard/pickboardcfg.cpp \
-            ../pickboard/pickboardpicks.cpp \
             keyboardimpl.cpp
         TARGET  = qkeyboard
         DESTDIR         = ../../plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
-LIBS            += -lqpe
+LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
         VERSION         = 1.0.0
 
 TRANSLATIONS = ../../i18n/de/libqkeyboard.ts \
diff --git a/inputmethods/keyboard/opie-keyboard.control b/inputmethods/keyboard/opie-keyboard.control
index cd60148..2a6b7a5 100644
--- a/inputmethods/keyboard/opie-keyboard.control
+++ b/inputmethods/keyboard/opie-keyboard.control
@@ -4,6 +4,6 @@ Section: opie/inputmethods
 Maintainer: Martin Jones <mjones@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION) opie-pickboard
 Description: Keyboard input method
  Keyboard input method for the Opie environment.
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 1171602..268640e 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -2,19 +2,15 @@ TEMPLATE	= lib
         CONFIG  += qt warn_on release
         HEADERS=   keyboard.h \
             configdlg.h \
-            ../pickboard/pickboardcfg.h \
-            ../pickboard/pickboardpicks.h \
             keyboardimpl.h 
         SOURCES=   keyboard.cpp \
             configdlg.cpp \
-            ../pickboard/pickboardcfg.cpp \
-            ../pickboard/pickboardpicks.cpp \
             keyboardimpl.cpp
         TARGET  = qmultikey
         DESTDIR         = $(OPIEDIR)/plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
-LIBS            += -lqpe
+LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
         VERSION         = 1.0.0
 
 TRANSLATIONS    = ../../i18n/pt_BR/libqmultikey.ts
diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control
index ce39f36..3de8b02 100644
--- a/inputmethods/multikey/opie-multikey.control
+++ b/inputmethods/multikey/opie-multikey.control
@@ -4,6 +4,6 @@ Section: opie/inputmethods
 Maintainer: Jake Richardson (jake@asdfnews.org)
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
-Depends: opie-base ($QPE_VERSION)
+Depends: opie-base ($QPE_VERSION) opie-pickboard
 Description: Multiple language keyboard
  Keyboard for inputing multiple languages in the OPIE environment.