author | eilers <eilers> | 2004-03-31 18:09:23 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-03-31 18:09:23 (UTC) |
commit | 4910b98d6fc0725337b494a03fa05e18209b99e3 (patch) (unidiff) | |
tree | b6b6b18dc31da4d0ed4e4f7ec596a3f9a8599696 /core/pim | |
parent | f878d5938aadaa967800032ab985210f85ad6ae7 (diff) | |
download | opie-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" ..
-rw-r--r-- | core/pim/addressbook/addressbook.pro | 2 | ||||
-rw-r--r-- | core/pim/addressbook/config.in | 2 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/addressbook/addressbook.pro | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/addressbook/config.in | 4 | ||||
-rw-r--r-- | core/pim/todo/config.in | 2 | ||||
-rw-r--r-- | core/pim/todo/todo.pro | 2 |
7 files changed, 8 insertions, 8 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 | |||
@@ -14,15 +14,15 @@ SOURCES = main.cpp \ | |||
14 | contacteditor.cpp \ | 14 | contacteditor.cpp \ |
15 | ablabel.cpp \ | 15 | ablabel.cpp \ |
16 | abtable.cpp \ | 16 | abtable.cpp \ |
17 | picker.cpp \ | 17 | picker.cpp \ |
18 | configdlg.cpp \ | 18 | configdlg.cpp \ |
19 | abconfig.cpp \ | 19 | abconfig.cpp \ |
20 | abview.cpp | 20 | abview.cpp |
21 | 21 | ||
22 | INTERFACES= configdlg_base.ui | 22 | INTERFACES= configdlg_base.ui |
23 | TARGET = addressbook | 23 | TARGET = addressbook |
24 | INCLUDEPATH += $(OPIEDIR)/include | 24 | INCLUDEPATH += $(OPIEDIR)/include |
25 | DEPENDPATH+= $(OPIEDIR)/include | 25 | DEPENDPATH+= $(OPIEDIR)/include |
26 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 | 26 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 |
27 | 27 | ||
28 | include ( $(OPIEDIR)/include.pro ) | 28 | 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 | |||
@@ -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 | |||
@@ -26,16 +26,16 @@ SOURCES = main.cpp \ | |||
26 | onoteedit.cpp \ | 26 | onoteedit.cpp \ |
27 | datebookdayallday.cpp | 27 | datebookdayallday.cpp |
28 | INTERFACES= dateentry.ui \ | 28 | INTERFACES= dateentry.ui \ |
29 | datebookdayheader.ui \ | 29 | datebookdayheader.ui \ |
30 | datebookweekheader.ui \ | 30 | datebookweekheader.ui \ |
31 | datebookweeklstheader.ui \ | 31 | datebookweeklstheader.ui \ |
32 | datebookweeklstdayhdr.ui \ | 32 | datebookweeklstdayhdr.ui \ |
33 | repeatentrybase.ui \ | 33 | repeatentrybase.ui \ |
34 | datebooksettingsbase.ui \ | 34 | datebooksettingsbase.ui \ |
35 | noteentry.ui | 35 | noteentry.ui |
36 | INCLUDEPATH += $(OPIEDIR)/include | 36 | INCLUDEPATH += $(OPIEDIR)/include |
37 | DEPENDPATH+= $(OPIEDIR)/include | 37 | DEPENDPATH+= $(OPIEDIR)/include |
38 | LIBS += -lqpe -lopieui2 | 38 | LIBS += -lqpe -lopieui2 -lopiecore2 |
39 | TARGET = datebook | 39 | TARGET = datebook |
40 | 40 | ||
41 | include ( $(OPIEDIR)/include.pro ) | 41 | include ( $(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 | |||
@@ -4,18 +4,18 @@ CONFIG += qt plugin | |||
4 | 4 | ||
5 | # Input | 5 | # Input |
6 | HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \ | 6 | HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \ |
7 | addresspluginwidget.h | 7 | addresspluginwidget.h |
8 | SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \ | 8 | SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \ |
9 | addresspluginwidget.cpp | 9 | addresspluginwidget.cpp |
10 | 10 | ||
11 | INCLUDEPATH += $(OPIEDIR)/include \ | 11 | INCLUDEPATH += $(OPIEDIR)/include \ |
12 | ../ ../library | 12 | ../ ../library |
13 | DEPENDPATH += $(OPIEDIR)/include \ | 13 | DEPENDPATH += $(OPIEDIR)/include \ |
14 | ../ ../library | 14 | ../ ../library |
15 | 15 | ||
16 | LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2 | 16 | LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2 |
17 | 17 | ||
18 | DESTDIR = $(OPIEDIR)/plugins/today | 18 | DESTDIR = $(OPIEDIR)/plugins/today |
19 | TARGET = todayaddressbookplugin | 19 | TARGET = todayaddressbookplugin |
20 | 20 | ||
21 | include ( $(OPIEDIR)/include.pro ) | 21 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -35,15 +35,15 @@ SOURCES = smalltodo.cpp \ | |||
35 | templatedialog.cpp \ | 35 | templatedialog.cpp \ |
36 | templatedialogimpl.cpp \ | 36 | templatedialogimpl.cpp \ |
37 | quickeditimpl.cpp \ | 37 | quickeditimpl.cpp \ |
38 | quickedit.cpp \ | 38 | quickedit.cpp \ |
39 | otaskeditor.cpp \ | 39 | otaskeditor.cpp \ |
40 | taskeditoroverview.cpp \ | 40 | taskeditoroverview.cpp \ |
41 | taskeditorstatus.cpp \ | 41 | taskeditorstatus.cpp \ |
42 | taskeditoralarms.cpp | 42 | taskeditoralarms.cpp |
43 | 43 | ||
44 | TARGET = todolist | 44 | TARGET = todolist |
45 | INCLUDEPATH += $(OPIEDIR)/include | 45 | INCLUDEPATH += $(OPIEDIR)/include |
46 | DEPENDPATH+= $(OPIEDIR)/include | 46 | DEPENDPATH+= $(OPIEDIR)/include |
47 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 | 47 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 |
48 | 48 | ||
49 | include ( $(OPIEDIR)/include.pro ) | 49 | include ( $(OPIEDIR)/include.pro ) |