summaryrefslogtreecommitdiff
authoreilers <eilers>2004-03-31 18:09:23 (UTC)
committer eilers <eilers>2004-03-31 18:09:23 (UTC)
commit4910b98d6fc0725337b494a03fa05e18209b99e3 (patch) (unidiff)
treeb6b6b18dc31da4d0ed4e4f7ec596a3f9a8599696
parentf878d5938aadaa967800032ab985210f85ad6ae7 (diff)
downloadopie-4910b98d6fc0725337b494a03fa05e18209b99e3.zip
opie-4910b98d6fc0725337b494a03fa05e18209b99e3.tar.gz
opie-4910b98d6fc0725337b494a03fa05e18209b99e3.tar.bz2
Removed all unnecessary dependencies to libopiedb2 and reimplemented
the conditional compilation of the SQL implementation. Therefore, it is possible to remove all dependencies of libsqlite and libopiedb2 etc. just by disabling the SQL support in the configuration ! If disabled, the usual xml-immplementation is used. Thanks to mickeyl who already fixed the "backends.pro" ..
Diffstat (more/less context) (show 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.pro9
-rw-r--r--libopie2/opiepim/config.in6
-rw-r--r--packages1
10 files changed, 21 insertions, 11 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
@@ -23,6 +23,6 @@ INTERFACES = configdlg_base.ui
23 TARGET = addressbook 23 TARGET = addressbook
24INCLUDEPATH += $(OPIEDIR)/include 24INCLUDEPATH += $(OPIEDIR)/include
25 DEPENDPATH+= $(OPIEDIR)/include 25 DEPENDPATH+= $(OPIEDIR)/include
26LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 26LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2
27 27
28include ( $(OPIEDIR)/include.pro ) 28include ( $(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
@@ -1,4 +1,4 @@
1 config ADDRESSBOOK 1 config ADDRESSBOOK
2 boolean "opie-addressbook (a simple addressbook)" 2 boolean "opie-addressbook (a simple addressbook)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB 4 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
@@ -35,7 +35,7 @@ INTERFACES = dateentry.ui \
35 noteentry.ui 35 noteentry.ui
36INCLUDEPATH += $(OPIEDIR)/include 36INCLUDEPATH += $(OPIEDIR)/include
37 DEPENDPATH+= $(OPIEDIR)/include 37 DEPENDPATH+= $(OPIEDIR)/include
38LIBS += -lqpe -lopieui2 38LIBS += -lqpe -lopieui2 -lopiecore2
39 TARGET = datebook 39 TARGET = datebook
40 40
41include ( $(OPIEDIR)/include.pro ) 41include ( $(OPIEDIR)/include.pro )
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
@@ -13,7 +13,7 @@ INCLUDEPATH += $(OPIEDIR)/include \
13DEPENDPATH += $(OPIEDIR)/include \ 13DEPENDPATH += $(OPIEDIR)/include \
14 ../ ../library 14 ../ ../library
15 15
16LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2 16LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2
17 17
18DESTDIR = $(OPIEDIR)/plugins/today 18DESTDIR = $(OPIEDIR)/plugins/today
19TARGET = todayaddressbookplugin 19TARGET = todayaddressbookplugin
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
@@ -1,7 +1,7 @@
1 config TODAY_ADDRESSBOOK 1 config TODAY_ADDRESSBOOK
2 boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)" 2 boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX
5 5
6 comment "opie-today-addressbookplugin requires libopie2core, libopie2ui, libopie2pim, libopie2db and libqtaux" 6 comment "opie-today-addressbookplugin requires libopie2core, libopie2ui, libopie2pim, libopie2db and libqtaux"
7 depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX ) 7 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
@@ -1,4 +1,4 @@
1 config TODO 1 config TODO
2 boolean "opie-todo (a Todo-list manager)" 2 boolean "opie-todo (a Todo-list manager)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB 4 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
@@ -44,6 +44,6 @@ SOURCES = smalltodo.cpp \
44 TARGET = todolist 44 TARGET = todolist
45INCLUDEPATH += $(OPIEDIR)/include 45INCLUDEPATH += $(OPIEDIR)/include
46 DEPENDPATH+= $(OPIEDIR)/include 46 DEPENDPATH+= $(OPIEDIR)/include
47LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 47LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2
48 48
49include ( $(OPIEDIR)/include.pro ) 49include ( $(OPIEDIR)/include.pro )
diff --git a/include.pro b/include.pro
index c19e2f0..ced5c9f 100644
--- a/include.pro
+++ b/include.pro
@@ -103,6 +103,15 @@ QMAKE_LFLAGS += -Wl
103LIBS -= -ldl 103LIBS -= -ldl
104LIBS -= -lcrypt 104LIBS -= -lcrypt
105LIBS -= -lm 105LIBS -= -lm
106
107 # Manual including indirect referenced libraries which are not loaded
108 # by the mac-linker automatically
109 CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
110 contains( CONFTEST, y ){
111 LIBS += -lopiedb2 -lqpe
112 } else {
113 LIBS += -lqpe
114 }
106} 115}
107else { 116else {
108QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 117QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
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
@@ -1,9 +1,9 @@
1 config LIBOPIE2PIM 1 config LIBOPIE2PIM
2 boolean "libopie2pim (pim related classes)" 2 boolean "libopie2pim (pim related classes)"
3 default "n" 3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
5 comment "libopie2pim needs a libqpe and libopie2core and libopie2db" 5 comment "libopie2pim needs a libqpe and libopie2core"
6 depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB) 6 depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE )
7 7
8 config SQL_PIM_BACKEND 8 config SQL_PIM_BACKEND
9 boolean "Enable SQL Backend for libopie2pim" 9 boolean "Enable SQL Backend for libopie2pim"
diff --git a/packages b/packages
index da2a9d9..a11e6a0 100644
--- a/packages
+++ b/packages
@@ -30,6 +30,7 @@ CONFIG_CLOCK noncore/tools/clock clock.pro
30 CONFIG_CONFEDIT noncore/apps/confeditconfedit.pro 30 CONFIG_CONFEDIT noncore/apps/confeditconfedit.pro
31 CONFIG_DASHER inputmethods/dasherdasher.pro 31 CONFIG_DASHER inputmethods/dasherdasher.pro
32 CONFIG_DATEBOOK core/pim/datebookdatebook.pro 32 CONFIG_DATEBOOK core/pim/datebookdatebook.pro
33 CONFIG_DATEBOOK2 core/pim/datebook2datebook2.pro
33 CONFIG_DECO_FLAT noncore/decorations/flatflat.pro 34 CONFIG_DECO_FLAT noncore/decorations/flatflat.pro
34 CONFIG_DECO_LIQUID noncore/decorations/liquidliquid.pro 35 CONFIG_DECO_LIQUID noncore/decorations/liquidliquid.pro
35 CONFIG_DECO_POLISHED noncore/decorations/polishedpolished.pro 36 CONFIG_DECO_POLISHED noncore/decorations/polishedpolished.pro