From 9387bc3f63b1e48c559d0758c50d9af857e7feeb Mon Sep 17 00:00:00 2001
From: simon <simon>
Date: Sun, 24 Nov 2002 10:36:54 +0000
Subject: - 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)
---
(limited to 'inputmethods/multikey')

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.
--
cgit v0.9.0.2