author | mickeyl <mickeyl> | 2004-03-28 18:29:54 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-28 18:29:54 (UTC) |
commit | dd23aa6470b671250ba57bec095d3bc0fab39102 (patch) (unidiff) | |
tree | d70c1925dc14a72b81f09cceb6afb26b0eb1c4b4 /libopie2/opiepim | |
parent | 78960cc882a2ecdfd3bde55b67cb8f78829d2a36 (diff) | |
download | opie-dd23aa6470b671250ba57bec095d3bc0fab39102.zip opie-dd23aa6470b671250ba57bec095d3bc0fab39102.tar.gz opie-dd23aa6470b671250ba57bec095d3bc0fab39102.tar.bz2 |
- remove optional SQL support from libopie1
- add optional SQL support to libopie2
-rw-r--r-- | libopie2/opiepim/backend/backends.pro | 22 | ||||
-rw-r--r-- | libopie2/opiepim/opiepim.pro | 7 |
2 files changed, 17 insertions, 12 deletions
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro index 953d928..7049aab 100644 --- a/libopie2/opiepim/backend/backends.pro +++ b/libopie2/opiepim/backend/backends.pro | |||
@@ -1,5 +1,5 @@ | |||
1 | SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ | 1 | SOURCES += \ |
2 | core/backends/ocontactaccessbackend_vcard.cpp \ | 2 | core/backends/ocontactaccessbackend_vcard.cpp \ |
3 | core/backends/ocontactaccessbackend_xml.cpp \ | 3 | core/backends/ocontactaccessbackend_xml.cpp \ |
4 | core/backends/ocontactaccess.cpp \ | 4 | core/backends/ocontactaccess.cpp \ |
5 | core/backends/odatebookaccessbackend.cpp \ | 5 | core/backends/odatebookaccessbackend.cpp \ |
@@ -8,24 +8,32 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ | |||
8 | core/backends/otodoaccess.cpp \ | 8 | core/backends/otodoaccess.cpp \ |
9 | core/backends/otodoaccesssql.cpp \ | 9 | core/backends/otodoaccesssql.cpp \ |
10 | core/backends/otodoaccessvcal.cpp \ | 10 | core/backends/otodoaccessvcal.cpp \ |
11 | core/backends/otodoaccessxml.cpp \ | 11 | core/backends/otodoaccessxml.cpp \ |
12 | core/backends/odatebookaccess.cpp \ | 12 | core/backends/odatebookaccess.cpp |
13 | core/backends/odatebookaccessbackend_sql.cpp | ||
14 | 13 | ||
15 | HEADERS += core/backends/obackendfactory.h \ | 14 | HEADERS += \ |
15 | core/backends/obackendfactory.h \ | ||
16 | core/backends/ocontactaccessbackend.h \ | 16 | core/backends/ocontactaccessbackend.h \ |
17 | core/backends/ocontactaccessbackend_sql.h \ | ||
18 | core/backends/ocontactaccessbackend_vcard.h \ | 17 | core/backends/ocontactaccessbackend_vcard.h \ |
19 | core/backends/ocontactaccessbackend_xml.h \ | 18 | core/backends/ocontactaccessbackend_xml.h \ |
20 | core/backends/ocontactaccess.h \ | 19 | core/backends/ocontactaccess.h \ |
21 | core/backends/odatebookaccessbackend.h \ | 20 | core/backends/odatebookaccessbackend.h \ |
22 | core/backends/odatebookaccessbackend_sql.h \ | ||
23 | core/backends/odatebookaccessbackend_xml.h \ | 21 | core/backends/odatebookaccessbackend_xml.h \ |
24 | core/backends/opimaccessbackend.h \ | 22 | core/backends/opimaccessbackend.h \ |
25 | core/backends/opimaccesstemplate.h \ | 23 | core/backends/opimaccesstemplate.h \ |
26 | core/backends/otodoaccessbackend.h \ | 24 | core/backends/otodoaccessbackend.h \ |
27 | core/backends/otodoaccess.h \ | 25 | core/backends/otodoaccess.h \ |
28 | core/backends/otodoaccesssql.h \ | ||
29 | core/backends/otodoaccessvcal.h \ | 26 | core/backends/otodoaccessvcal.h \ |
30 | core/backends/otodoaccessxml.h \ | 27 | core/backends/otodoaccessxml.h \ |
31 | core/backends/odatebookaccess.h | 28 | core/backends/odatebookaccess.h |
29 | |||
30 | contains( ENABLE_SQL_PIM_BACKEND, y ) { | ||
31 | DEFINES += __USE_SQL | ||
32 | LIBS += -lopiedb2 | ||
33 | HEADERS += core/backends/otodoaccesssql.h \ | ||
34 | core/backends/ocontactaccessbackend_sql.h \ | ||
35 | core/backends/odatebookaccessbackend_sql.h | ||
36 | SOURCES += core/backends/otodoaccesssql.cpp \ | ||
37 | core/backends/ocontactaccessbackend_sql.cpp \ | ||
38 | core/backends/odatebookaccessbackend_sql.cpp | ||
39 | } | ||
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro index c328315..416765e 100644 --- a/libopie2/opiepim/opiepim.pro +++ b/libopie2/opiepim/opiepim.pro | |||
@@ -1,26 +1,23 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on debug | 2 | CONFIG += qt warn_on |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ | 4 | HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ |
5 | opimnotifymanager.h opimevent.h | 5 | opimnotifymanager.h opimevent.h |
6 | 6 | ||
7 | SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ | 7 | SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ |
8 | opimnotifymanager.cpp opimevent.cpp | 8 | opimnotifymanager.cpp opimevent.cpp |
9 | INTERFACES = | 9 | INTERFACES = |
10 | TARGET = opiepim2 | 10 | TARGET = opiepim2 |
11 | VERSION = 1.8.4 | 11 | VERSION = 1.8.5 |
12 | INCLUDEPATH += $(OPIEDIR)/include | 12 | INCLUDEPATH += $(OPIEDIR)/include |
13 | DEPENDPATH += $(OPIEDIR)/include | 13 | DEPENDPATH += $(OPIEDIR)/include |
14 | LIBS += -lopiecore2 | 14 | LIBS += -lopiecore2 |
15 | 15 | ||
16 | include ( core/core.pro ) | 16 | include ( core/core.pro ) |
17 | include ( core/backends/backends.pro ) | 17 | include ( core/backends/backends.pro ) |
18 | include ( ui/ui.pro ) | 18 | include ( ui/ui.pro ) |
19 | 19 | ||
20 | contains( ENABLE_SQL_PIM_BACKEND, y ) | ||
21 | LIBS += -lopiedb2 | ||
22 | |||
23 | !contains( platform, x11 ) { | 20 | !contains( platform, x11 ) { |
24 | include ( $(OPIEDIR)/include.pro ) | 21 | include ( $(OPIEDIR)/include.pro ) |
25 | } | 22 | } |
26 | 23 | ||