summaryrefslogtreecommitdiff
authorclem <clem>2004-10-17 16:37:58 (UTC)
committer clem <clem>2004-10-17 16:37:58 (UTC)
commit3f8e8d7d5b933f2a639d4284d7c7fbec2bee5199 (patch) (unidiff)
treea1da7360d326daef05e611a6d22881c4450e5c44
parent06fffb97be58c738176260bac17e3dfa6789e26e (diff)
downloadopie-3f8e8d7d5b933f2a639d4284d7c7fbec2bee5199.zip
opie-3f8e8d7d5b933f2a639d4284d7c7fbec2bee5199.tar.gz
opie-3f8e8d7d5b933f2a639d4284d7c7fbec2bee5199.tar.bz2
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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/lockapplet/lockapplet.pro2
-rw-r--r--examples/simple-pim/config.in2
-rw-r--r--libslcompat/config.in2
-rw-r--r--noncore/applets/zkbapplet/config.in2
-rw-r--r--noncore/apps/opie-reader/config.in2
-rw-r--r--noncore/apps/qashmoney/config.in2
-rw-r--r--noncore/games/kbill/config.in2
-rw-r--r--noncore/games/mindbreaker/config.in2
-rw-r--r--noncore/games/sfcave-sdl/config.in2
-rw-r--r--noncore/games/sfcave/config.in2
-rwxr-xr-xnoncore/games/solitaire/solitaire.pro2
-rw-r--r--noncore/settings/tabmanager/config.in2
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/config.in2
13 files changed, 13 insertions, 13 deletions
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
@@ -3,10 +3,10 @@ CONFIG += qt plugn warn_on
3HEADERS = lock.h 3HEADERS = lock.h
4SOURCES = lock.cpp 4SOURCES = lock.cpp
5TARGET = lockapplet 5TARGET = lockapplet
6DESTDIR = $(OPIEDIR)/plugins/applets 6DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopiesecurity2
10VERSION = 1.0.0 10VERSION = 1.0.0
11 11
12include ( $(OPIEDIR)/include.pro ) 12include ( $(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 @@
1 config SIMPLE_PIM 1 config SIMPLE_PIM
2 boolean "Mainwindow with PIM and QCOP usage" 2 boolean "Mainwindow with PIM and QCOP usage"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIE2CORE && LIBOPIE2PIM 4 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 @@
1 config LIBSLCOMPAT 1 config LIBSLCOMPAT
2 boolean "Sharp libsl compatibility library" 2 boolean "Sharp libsl compatibility library"
3 default "n" 3 default "n"
4 depends on LIBOPIE2UI 4 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 @@
1 config ZKBAPPLET 1 config ZKBAPPLET
2 boolean "zkbapplet (Switch hardware keyboard layout on the fly)" 2 boolean "zkbapplet (Switch hardware keyboard layout on the fly)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) 4 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 @@
1 config OPIE-READER 1 config OPIE-READER
2 boolean "opie-reader (E-Text reader)" 2 boolean "opie-reader (E-Text reader)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 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 @@
1 config QASHMONEY 1 config QASHMONEY
2 boolean "opie-qashmoney (money manager)" 2 boolean "opie-qashmoney (money manager)"
3 default "n" 3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 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 @@
1 config KBILL 1 config KBILL
2 boolean "opie-kbill (hit Bill before he can infect your network with a wannabe OS)" 2 boolean "opie-kbill (hit Bill before he can infect your network with a wannabe OS)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 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 @@
1 config MINDBREAKER 1 config MINDBREAKER
2 boolean "opie-mindbreaker (crack the coloured code)" 2 boolean "opie-mindbreaker (crack the coloured code)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 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 @@
1 config SFCAVE-SDL 1 config SFCAVE-SDL
2 boolean "sfcave-sdl (SDL version of this game, needs the proper libraries)" 2 boolean "sfcave-sdl (SDL version of this game, needs the proper libraries)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSDL_DEP 4 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 @@
1 config SFCAVE 1 config SFCAVE
2 boolean "opie-sfcave (fly the dot though the cave avoiding the walls)" 2 boolean "opie-sfcave (fly the dot though the cave avoiding the walls)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 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
@@ -11,10 +11,10 @@ SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp \
11 patiencecardgame.cpp canvascardwindow.cpp main.cpp 11 patiencecardgame.cpp canvascardwindow.cpp main.cpp
12 12
13TARGET = patience 13TARGET = patience
14 14
15INCLUDEPATH += $(OPIEDIR)/include 15INCLUDEPATH += $(OPIEDIR)/include
16DEPENDPATH += $(OPIEDIR)/include 16DEPENDPATH += $(OPIEDIR)/include
17LIBS += -lqpe 17LIBS += -lqpe -lopiecore2
18 18
19 19
20include ( $(OPIEDIR)/include.pro ) 20include ( $(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 @@
1 config TABMANAGER 1 config TABMANAGER
2 boolean "opie-tabmanager (menu editor for the Opie taskbar)" 2 boolean "opie-tabmanager (menu editor for the Opie taskbar)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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 @@
1config TODAY_STOCKTICKERLIB 1config TODAY_STOCKTICKERLIB
2 boolean 2 boolean
3 default "y" if TODAY_STOCKTICKER 3 default "y" if TODAY_STOCKTICKER
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY && LIBQTAUX