author | mickeyl <mickeyl> | 2004-03-28 23:32:41 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-28 23:32:41 (UTC) |
commit | 3af77639ad7a1f5acf66220fe493df424e40f949 (patch) (unidiff) | |
tree | bd6b6730aa95ace39ce9a13800d18d97e0bc0829 | |
parent | 780fbf818882654e9a7e5fac6fc1bc9022bb31f3 (diff) | |
download | opie-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
-rw-r--r-- | libopie2/opiepim/backend/backends.pro | 7 | ||||
-rw-r--r-- | libopie2/opiepim/opiepim.pro | 4 |
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 | |||
@@ -3,13 +3,12 @@ SOURCES += \ | |||
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 | ||
14 | HEADERS += \ | 13 | HEADERS += \ |
15 | core/backends/obackendfactory.h \ | 14 | core/backends/obackendfactory.h \ |
@@ -25,15 +24,21 @@ HEADERS += \ | |||
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 | ||
30 | contains( ENABLE_SQL_PIM_BACKEND, y ) { | 29 | contains( 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 | |||
@@ -5,23 +5,23 @@ HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnoti | |||
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.5 | 11 | VERSION = 1.8.6 |
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 ( $(OPIEDIR)/gen.pro ) | ||
16 | include ( core/core.pro ) | 17 | include ( core/core.pro ) |
17 | include ( core/backends/backends.pro ) | 18 | include ( core/backends/backends.pro ) |
18 | include ( ui/ui.pro ) | 19 | include ( 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 | ||
24 | contains( platform, x11 ) { | 25 | contains( platform, x11 ) { |
25 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 26 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
26 | } | 27 | } |
27 | |||