| author | mickeyl <mickeyl> | 2004-03-28 23:32:41 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-03-28 23:32:41 (UTC) |
| commit | 3af77639ad7a1f5acf66220fe493df424e40f949 (patch) (side-by-side diff) | |
| 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 @@ -5,9 +5,8 @@ SOURCES += \ core/backends/odatebookaccessbackend.cpp \ core/backends/odatebookaccessbackend_xml.cpp \ core/backends/otodoaccessbackend.cpp \ core/backends/otodoaccess.cpp \ - core/backends/otodoaccesssql.cpp \ core/backends/otodoaccessvcal.cpp \ core/backends/otodoaccessxml.cpp \ core/backends/odatebookaccess.cpp @@ -27,8 +26,9 @@ HEADERS += \ core/backends/otodoaccessxml.h \ core/backends/odatebookaccess.h contains( ENABLE_SQL_PIM_BACKEND, y ) { + message ( Enabling the SQL Backend for libopiepim2 ) DEFINES += __USE_SQL LIBS += -lopiedb2 HEADERS += core/backends/otodoaccesssql.h \ core/backends/ocontactaccessbackend_sql.h \ @@ -36,4 +36,9 @@ contains( ENABLE_SQL_PIM_BACKEND, y ) { SOURCES += core/backends/otodoaccesssql.cpp \ core/backends/ocontactaccessbackend_sql.cpp \ core/backends/odatebookaccessbackend_sql.cpp } + +!contains( ENABLE_SQL_PIM_BACKEND, y ) { + message ( No SQL Backend in libopiepim2 ) +} + 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 SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ opimnotifymanager.cpp opimevent.cpp INTERFACES = TARGET = opiepim2 -VERSION = 1.8.5 +VERSION = 1.8.6 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lopiecore2 +include ( $(OPIEDIR)/gen.pro ) include ( core/core.pro ) include ( core/backends/backends.pro ) include ( ui/ui.pro ) @@ -23,5 +24,4 @@ include ( ui/ui.pro ) contains( platform, x11 ) { LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib } - |