-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 | |||
@@ -5,9 +5,8 @@ SOURCES += \ | |||
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 | ||
@@ -27,8 +26,9 @@ HEADERS += \ | |||
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 \ |
@@ -36,4 +36,9 @@ contains( ENABLE_SQL_PIM_BACKEND, y ) { | |||
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 | |||
@@ -7,13 +7,14 @@ HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnoti | |||
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 | ||
@@ -23,5 +24,4 @@ include ( ui/ui.pro ) | |||
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 | |||