summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.pro2
-rw-r--r--core/pim/addressbook/config.in2
-rw-r--r--core/pim/datebook/datebook.pro2
-rw-r--r--core/pim/today/plugins/addressbook/addressbook.pro2
-rw-r--r--core/pim/today/plugins/addressbook/config.in4
-rw-r--r--core/pim/todo/config.in2
-rw-r--r--core/pim/todo/todo.pro2
-rw-r--r--include.pro17
-rw-r--r--libopie2/opiepim/config.in6
-rw-r--r--packages1
10 files changed, 25 insertions, 15 deletions
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 8bf19f5..b27e4b8 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -24,5 +24,5 @@ TARGET = addressbook
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2
+LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2
include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/addressbook/config.in b/core/pim/addressbook/config.in
index 7ecf14c..ab16fef 100644
--- a/core/pim/addressbook/config.in
+++ b/core/pim/addressbook/config.in
@@ -2,3 +2,3 @@
boolean "opie-addressbook (a simple addressbook)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 8fbc1ca..bf9a2cc 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -36,5 +36,5 @@ INTERFACES = dateentry.ui \
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopieui2
+LIBS += -lqpe -lopieui2 -lopiecore2
TARGET = datebook
diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index 7804297..3877fad 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -14,5 +14,5 @@ DEPENDPATH += $(OPIEDIR)/include \
../ ../library
-LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2
+LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2
DESTDIR = $(OPIEDIR)/plugins/today
diff --git a/core/pim/today/plugins/addressbook/config.in b/core/pim/today/plugins/addressbook/config.in
index 33e8b6d..c212064 100644
--- a/core/pim/today/plugins/addressbook/config.in
+++ b/core/pim/today/plugins/addressbook/config.in
@@ -2,6 +2,6 @@
boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX
comment "opie-today-addressbookplugin requires libopie2core, libopie2ui, libopie2pim, libopie2db and libqtaux"
- depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX )
+ depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX )
diff --git a/core/pim/todo/config.in b/core/pim/todo/config.in
index 6904174..45c4558 100644
--- a/core/pim/todo/config.in
+++ b/core/pim/todo/config.in
@@ -2,3 +2,3 @@
boolean "opie-todo (a Todo-list manager)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index 1271d2d..eea5db7 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -45,5 +45,5 @@ TARGET = todolist
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2
+LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2
include ( $(OPIEDIR)/include.pro )
diff --git a/include.pro b/include.pro
index c19e2f0..ced5c9f 100644
--- a/include.pro
+++ b/include.pro
@@ -100,8 +100,17 @@ QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease mess
CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
contains( CONFTEST, y ){
-QMAKE_LFLAGS += -Wl
-LIBS -= -ldl
-LIBS -= -lcrypt
-LIBS -= -lm
+ QMAKE_LFLAGS += -Wl
+ LIBS -= -ldl
+ LIBS -= -lcrypt
+ LIBS -= -lm
+
+ # Manual including indirect referenced libraries which are not loaded
+ # by the mac-linker automatically
+ CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
+ contains( CONFTEST, y ){
+ LIBS += -lopiedb2 -lqpe
+ } else {
+ LIBS += -lqpe
+ }
}
else {
diff --git a/libopie2/opiepim/config.in b/libopie2/opiepim/config.in
index fb75fcc..2c920bb 100644
--- a/libopie2/opiepim/config.in
+++ b/libopie2/opiepim/config.in
@@ -2,7 +2,7 @@
boolean "libopie2pim (pim related classes)"
default "n"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB
- comment "libopie2pim needs a libqpe and libopie2core and libopie2db"
- depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB)
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+ comment "libopie2pim needs a libqpe and libopie2core"
+ depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE )
config SQL_PIM_BACKEND
diff --git a/packages b/packages
index da2a9d9..a11e6a0 100644
--- a/packages
+++ b/packages
@@ -31,4 +31,5 @@ CONFIG_CONFEDIT noncore/apps/confedit confedit.pro
CONFIG_DASHER inputmethods/dasher dasher.pro
CONFIG_DATEBOOK core/pim/datebook datebook.pro
+CONFIG_DATEBOOK2 core/pim/datebook2 datebook2.pro
CONFIG_DECO_FLAT noncore/decorations/flat flat.pro
CONFIG_DECO_LIQUID noncore/decorations/liquid liquid.pro