| -rw-r--r-- | libopie/libopie.pro | 13 | ||||
| -rw-r--r-- | libopie2/opiepim/backend/backends.pro | 22 | ||||
| -rw-r--r-- | libopie2/opiepim/opiepim.pro | 7 |
3 files changed, 18 insertions, 24 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index 145743d..783c11d 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro @@ -1,8 +1,8 @@ TEMPLATE = lib -CONFIG += qte warn_on release +CONFIG += qte warn_on HEADERS = ofontmenu.h \ ocolorbutton.h \ ofiledialog.h ofileselector.h \ ofileselector_p.h \ ocheckitem.h \ xmltree.h \ @@ -92,22 +92,11 @@ SOURCES = ofontmenu.cc \ TARGET = opie INCLUDEPATH += $(OPIEDIR)/include DESTDIR = $(OPIEDIR)/lib$(PROJMAK) LIBS += -lqpe -# Add SQL-Support if selected by config (eilers) -CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) -contains( CONFTEST, y ){ - -DEFINES += __USE_SQL -LIBS += -lopiedb2 -HEADERS += pim/otodoaccesssql.h pim/ocontactaccessbackend_sql.h pim/odatebookaccessbackend_sql.h -SOURCES += pim/otodoaccesssql.cpp pim/ocontactaccessbackend_sql.cpp pim/odatebookaccessbackend_sql.cpp - -} - INTERFACES = otimepickerbase.ui orecurrancebase.ui TARGET = opie include ( $(OPIEDIR)/include.pro ) 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,31 +1,39 @@ -SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ +SOURCES += \ core/backends/ocontactaccessbackend_vcard.cpp \ core/backends/ocontactaccessbackend_xml.cpp \ core/backends/ocontactaccess.cpp \ 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 \ - 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,28 +1,25 @@ 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 SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ opimnotifymanager.cpp opimevent.cpp INTERFACES = TARGET = opiepim2 -VERSION = 1.8.4 +VERSION = 1.8.5 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lopiecore2 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 ) } contains( platform, x11 ) { LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |