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/dvorak')

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