summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-03-28 23:32:41 (UTC)
committer mickeyl <mickeyl>2004-03-28 23:32:41 (UTC)
commit3af77639ad7a1f5acf66220fe493df424e40f949 (patch) (unidiff)
treebd6b6730aa95ace39ce9a13800d18d97e0bc0829
parent780fbf818882654e9a7e5fac6fc1bc9022bb31f3 (diff)
downloadopie-3af77639ad7a1f5acf66220fe493df424e40f949.zip
opie-3af77639ad7a1f5acf66220fe493df424e40f949.tar.gz
opie-3af77639ad7a1f5acf66220fe493df424e40f949.tar.bz2
enabling and disabling the SQL stuff for libopiepim2 should now (finally) work
note that you may have to 'make mrproper' after enabling/disabling
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/backends.pro7
-rw-r--r--libopie2/opiepim/opiepim.pro4
2 files changed, 8 insertions, 3 deletions
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index 7049aab..f91e98a 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -1,39 +1,44 @@
1SOURCES += \ 1SOURCES += \
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 \
6 core/backends/odatebookaccessbackend_xml.cpp \ 6 core/backends/odatebookaccessbackend_xml.cpp \
7 core/backends/otodoaccessbackend.cpp \ 7 core/backends/otodoaccessbackend.cpp \
8 core/backends/otodoaccess.cpp \ 8 core/backends/otodoaccess.cpp \
9 core/backends/otodoaccesssql.cpp \
10 core/backends/otodoaccessvcal.cpp \ 9 core/backends/otodoaccessvcal.cpp \
11 core/backends/otodoaccessxml.cpp \ 10 core/backends/otodoaccessxml.cpp \
12 core/backends/odatebookaccess.cpp 11 core/backends/odatebookaccess.cpp
13 12
14HEADERS += \ 13HEADERS += \
15 core/backends/obackendfactory.h \ 14 core/backends/obackendfactory.h \
16 core/backends/ocontactaccessbackend.h \ 15 core/backends/ocontactaccessbackend.h \
17 core/backends/ocontactaccessbackend_vcard.h \ 16 core/backends/ocontactaccessbackend_vcard.h \
18 core/backends/ocontactaccessbackend_xml.h \ 17 core/backends/ocontactaccessbackend_xml.h \
19 core/backends/ocontactaccess.h \ 18 core/backends/ocontactaccess.h \
20 core/backends/odatebookaccessbackend.h \ 19 core/backends/odatebookaccessbackend.h \
21 core/backends/odatebookaccessbackend_xml.h \ 20 core/backends/odatebookaccessbackend_xml.h \
22 core/backends/opimaccessbackend.h \ 21 core/backends/opimaccessbackend.h \
23 core/backends/opimaccesstemplate.h \ 22 core/backends/opimaccesstemplate.h \
24 core/backends/otodoaccessbackend.h \ 23 core/backends/otodoaccessbackend.h \
25 core/backends/otodoaccess.h \ 24 core/backends/otodoaccess.h \
26 core/backends/otodoaccessvcal.h \ 25 core/backends/otodoaccessvcal.h \
27 core/backends/otodoaccessxml.h \ 26 core/backends/otodoaccessxml.h \
28 core/backends/odatebookaccess.h 27 core/backends/odatebookaccess.h
29 28
30contains( ENABLE_SQL_PIM_BACKEND, y ) { 29contains( ENABLE_SQL_PIM_BACKEND, y ) {
30 message ( Enabling the SQL Backend for libopiepim2 )
31 DEFINES += __USE_SQL 31 DEFINES += __USE_SQL
32 LIBS += -lopiedb2 32 LIBS += -lopiedb2
33 HEADERS += core/backends/otodoaccesssql.h \ 33 HEADERS += core/backends/otodoaccesssql.h \
34 core/backends/ocontactaccessbackend_sql.h \ 34 core/backends/ocontactaccessbackend_sql.h \
35 core/backends/odatebookaccessbackend_sql.h 35 core/backends/odatebookaccessbackend_sql.h
36 SOURCES += core/backends/otodoaccesssql.cpp \ 36 SOURCES += core/backends/otodoaccesssql.cpp \
37 core/backends/ocontactaccessbackend_sql.cpp \ 37 core/backends/ocontactaccessbackend_sql.cpp \
38 core/backends/odatebookaccessbackend_sql.cpp 38 core/backends/odatebookaccessbackend_sql.cpp
39} 39}
40
41!contains( ENABLE_SQL_PIM_BACKEND, y ) {
42 message ( No SQL Backend in libopiepim2 )
43}
44
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro
index 416765e..318aecf 100644
--- a/libopie2/opiepim/opiepim.pro
+++ b/libopie2/opiepim/opiepim.pro
@@ -1,27 +1,27 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ 4HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \
5 opimnotifymanager.h opimevent.h 5 opimnotifymanager.h opimevent.h
6 6
7SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ 7SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \
8 opimnotifymanager.cpp opimevent.cpp 8 opimnotifymanager.cpp opimevent.cpp
9INTERFACES = 9INTERFACES =
10TARGET = opiepim2 10TARGET = opiepim2
11VERSION = 1.8.5 11VERSION = 1.8.6
12INCLUDEPATH += $(OPIEDIR)/include 12INCLUDEPATH += $(OPIEDIR)/include
13DEPENDPATH += $(OPIEDIR)/include 13DEPENDPATH += $(OPIEDIR)/include
14LIBS += -lopiecore2 14LIBS += -lopiecore2
15 15
16include ( $(OPIEDIR)/gen.pro )
16include ( core/core.pro ) 17include ( core/core.pro )
17include ( core/backends/backends.pro ) 18include ( core/backends/backends.pro )
18include ( ui/ui.pro ) 19include ( ui/ui.pro )
19 20
20!contains( platform, x11 ) { 21!contains( platform, x11 ) {
21 include ( $(OPIEDIR)/include.pro ) 22 include ( $(OPIEDIR)/include.pro )
22} 23}
23 24
24contains( platform, x11 ) { 25contains( platform, x11 ) {
25 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 26 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
26} 27}
27