From 3f8e8d7d5b933f2a639d4284d7c7fbec2bee5199 Mon Sep 17 00:00:00 2001
From: clem <clem>
Date: Sun, 17 Oct 2004 16:37:58 +0000
Subject: fixed some more .pro / config.in dependencies discrepancies, that could break builds; for a few games, there was an unnecessary dep on LIBOPIE2CORE in some games too

---
diff --git a/core/applets/lockapplet/lockapplet.pro b/core/applets/lockapplet/lockapplet.pro
index e0ee780..b890585 100644
--- a/core/applets/lockapplet/lockapplet.pro
+++ b/core/applets/lockapplet/lockapplet.pro
@@ -6,7 +6,7 @@ TARGET        = lockapplet
 DESTDIR       = $(OPIEDIR)/plugins/applets
 INCLUDEPATH  += $(OPIEDIR)/include
 DEPENDPATH   += $(OPIEDIR)/include
-LIBS         += -lqpe
+LIBS         += -lqpe -lopiesecurity2
 VERSION       = 1.0.0
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/examples/simple-pim/config.in b/examples/simple-pim/config.in
index 100c27a..dd1e93b 100644
--- a/examples/simple-pim/config.in
+++ b/examples/simple-pim/config.in
@@ -1,4 +1,4 @@
   config SIMPLE_PIM
     boolean "Mainwindow with PIM and QCOP usage"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIE2CORE && LIBOPIE2PIM
+    depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/libslcompat/config.in b/libslcompat/config.in
index 365d217..87db3c2 100644
--- a/libslcompat/config.in
+++ b/libslcompat/config.in
@@ -1,4 +1,4 @@
   config LIBSLCOMPAT
     boolean "Sharp libsl compatibility library"
     default "n"
-    depends on LIBOPIE2UI
+    depends on LIBOPIE2UI && LIBQTAUX
diff --git a/noncore/applets/zkbapplet/config.in b/noncore/applets/zkbapplet/config.in
index b3d3fc5..1960e0b 100644
--- a/noncore/applets/zkbapplet/config.in
+++ b/noncore/applets/zkbapplet/config.in
@@ -1,4 +1,4 @@
   config ZKBAPPLET
     boolean "zkbapplet (Switch hardware keyboard layout on the fly)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/opie-reader/config.in b/noncore/apps/opie-reader/config.in
index 241562e..9f80a93 100644
--- a/noncore/apps/opie-reader/config.in
+++ b/noncore/apps/opie-reader/config.in
@@ -1,4 +1,4 @@
   config OPIE-READER
     boolean "opie-reader (E-Text reader)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/apps/qashmoney/config.in b/noncore/apps/qashmoney/config.in
index aeed298..094f845 100644
--- a/noncore/apps/qashmoney/config.in
+++ b/noncore/apps/qashmoney/config.in
@@ -1,4 +1,4 @@
   config QASHMONEY
     boolean "opie-qashmoney (money manager)" 
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSQLITE_DEP
diff --git a/noncore/games/kbill/config.in b/noncore/games/kbill/config.in
index a505e34..ba830a9 100644
--- a/noncore/games/kbill/config.in
+++ b/noncore/games/kbill/config.in
@@ -1,4 +1,4 @@
   config KBILL
     boolean "opie-kbill (hit Bill before he can infect your network with a wannabe OS)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/games/mindbreaker/config.in b/noncore/games/mindbreaker/config.in
index e3c0812..b97a9e8 100644
--- a/noncore/games/mindbreaker/config.in
+++ b/noncore/games/mindbreaker/config.in
@@ -1,4 +1,4 @@
   config MINDBREAKER
     boolean "opie-mindbreaker (crack the coloured code)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/games/sfcave-sdl/config.in b/noncore/games/sfcave-sdl/config.in
index 2b94679..62953f4 100644
--- a/noncore/games/sfcave-sdl/config.in
+++ b/noncore/games/sfcave-sdl/config.in
@@ -1,4 +1,4 @@
   config SFCAVE-SDL
     boolean "sfcave-sdl (SDL version of this game, needs the proper libraries)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSDL_DEP
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBSDL_DEP
diff --git a/noncore/games/sfcave/config.in b/noncore/games/sfcave/config.in
index e486276..cdd04ee 100644
--- a/noncore/games/sfcave/config.in
+++ b/noncore/games/sfcave/config.in
@@ -1,4 +1,4 @@
   config SFCAVE
     boolean "opie-sfcave (fly the dot though the cave avoiding the walls)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro
index d9f882d..9c653a7 100755
--- a/noncore/games/solitaire/solitaire.pro
+++ b/noncore/games/solitaire/solitaire.pro
@@ -14,7 +14,7 @@ TARGET    = patience
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe 
+LIBS            += -lqpe -lopiecore2
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/tabmanager/config.in b/noncore/settings/tabmanager/config.in
index 3d3a080..39b98be 100644
--- a/noncore/settings/tabmanager/config.in
+++ b/noncore/settings/tabmanager/config.in
@@ -1,4 +1,4 @@
   config TABMANAGER
     boolean "opie-tabmanager (menu editor for the Opie taskbar)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/config.in b/noncore/todayplugins/stockticker/stocktickerlib/config.in
index 7dbe03a..af71cad 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/config.in
+++ b/noncore/todayplugins/stockticker/stocktickerlib/config.in
@@ -1,4 +1,4 @@
 config TODAY_STOCKTICKERLIB
   boolean
   default "y" if TODAY_STOCKTICKER
-  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY && LIBQTAUX
--
cgit v0.9.0.2