4 files changed, 4 insertions, 7 deletions

diff --git a/core/apps/oapp/config.in b/core/apps/oapp/config.in
index a40149d..9f3ea10 100644
--- a/core/apps/oapp/config.in
+++ b/core/apps/oapp/config.in
@@ -1,4 +1,4 @@
   config OAPP
     boolean "oapp"
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && EXPERIMENTAL
diff --git a/core/apps/oapp/oapp.pro b/core/apps/oapp/oapp.pro
index 9cc2c42..b715c0e 100644
--- a/core/apps/oapp/oapp.pro
+++ b/core/apps/oapp/oapp.pro
@@ -4,7 +4,7 @@ CONFIG		= qt warn_on
         TARGET  = oapp
         VERSION         = 1.0.0
 
-        LIBS    += -lqpe -lopie
+        LIBS    += -lqpe
         HEADERS         = \
                   oappplugin.h \
                   oappinterface.h
@@ -14,8 +14,5 @@ SOURCES		= \
         DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
         INCLUDEPATH+= $(OPIEDIR)/include 
         DEPENDPATH+= $(OPIEDIR)/include .
-        MOC_DIR         = .build
-        OBJECTS_DIR= .build
-        UI_DIR  = .build
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/todolist/config.in b/core/pim/today/plugins/todolist/config.in
index 48ba226..2a61045 100644
--- a/core/pim/today/plugins/todolist/config.in
+++ b/core/pim/today/plugins/todolist/config.in
@@ -1,4 +1,4 @@
   config TODAY_TODOLIST
     boolean "todolist"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
index 001e91c..f47f915 100644
--- a/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
+++ b/core/pim/today/plugins/todolist/opie-today-todolistplugin.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/plugins
 Maintainer: Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Depends: libqte2, opie-today
+Depends: libopiecore2, libopieui2, libopiepim2, opie-today
 Description: Todo list plugin for Today
  Displays todo list items.
 Version: $QPE_VERSION$EXTRAVERSION