| -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,4 +1,4 @@ -SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ +SOURCES += \ core/backends/ocontactaccessbackend_vcard.cpp \ core/backends/ocontactaccessbackend_xml.cpp \ core/backends/ocontactaccess.cpp \ @@ -9,23 +9,31 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ core/backends/otodoaccesssql.cpp \ core/backends/otodoaccessvcal.cpp \ core/backends/otodoaccessxml.cpp \ - core/backends/odatebookaccess.cpp \ - core/backends/odatebookaccessbackend_sql.cpp + core/backends/odatebookaccess.cpp -HEADERS += core/backends/obackendfactory.h \ +HEADERS += \ + core/backends/obackendfactory.h \ core/backends/ocontactaccessbackend.h \ - core/backends/ocontactaccessbackend_sql.h \ core/backends/ocontactaccessbackend_vcard.h \ core/backends/ocontactaccessbackend_xml.h \ core/backends/ocontactaccess.h \ core/backends/odatebookaccessbackend.h \ - core/backends/odatebookaccessbackend_sql.h \ core/backends/odatebookaccessbackend_xml.h \ core/backends/opimaccessbackend.h \ core/backends/opimaccesstemplate.h \ core/backends/otodoaccessbackend.h \ core/backends/otodoaccess.h \ - core/backends/otodoaccesssql.h \ core/backends/otodoaccessvcal.h \ core/backends/otodoaccessxml.h \ core/backends/odatebookaccess.h + +contains( ENABLE_SQL_PIM_BACKEND, y ) { + DEFINES += __USE_SQL + LIBS += -lopiedb2 + HEADERS += core/backends/otodoaccesssql.h \ + core/backends/ocontactaccessbackend_sql.h \ + core/backends/odatebookaccessbackend_sql.h + SOURCES += core/backends/otodoaccesssql.cpp \ + core/backends/ocontactaccessbackend_sql.cpp \ + core/backends/odatebookaccessbackend_sql.cpp +} 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,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt warn_on debug +CONFIG += qt warn_on DESTDIR = $(OPIEDIR)/lib HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ opimnotifymanager.h opimevent.h @@ -8,7 +8,7 @@ SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotifymanager.cpp opimevent.cpp INTERFACES = TARGET = opiepim2 -VERSION = 1.8.4 +VERSION = 1.8.5 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lopiecore2 @@ -17,9 +17,6 @@ include ( core/core.pro ) include ( core/backends/backends.pro ) include ( ui/ui.pro ) -contains( ENABLE_SQL_PIM_BACKEND, y ) - LIBS += -lopiedb2 - !contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) } |