summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make7
-rw-r--r--include.pro2
-rw-r--r--libopie2/opiepim/opiepim.pro7
3 files changed, 12 insertions, 4 deletions
diff --git a/Rules.make b/Rules.make
index 1db17ee..8cacfb0 100644
--- a/Rules.make
+++ b/Rules.make
@@ -26,13 +26,18 @@ ifneq ($(CONFIG_QUICK_LAUNCH),)
26 echo \} >> $@ 26 echo \} >> $@
27else 27else
28 echo contains\( CONFIG, quick-app \) \{ >> $@ 28 echo contains\( CONFIG, quick-app \) \{ >> $@
29 echo CONFIG -= quick-app >> $@ 29 echo CONFIG -= quick-app >> $@
30 echo CONFIG += quick-app-bin >> $@ 30 echo CONFIG += quick-app-bin >> $@
31 echo \} >> $@ 31 echo \} >> $@
32 endif 32endif
33ifeq ($(CONFIG_SQL_PIM_BACKEND),y)
34 echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@
35else
36 echo ENABLE_SQL_PIM_BACKEND=n >> $@
37endif
33ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) 38ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
34 echo CONFIG += no-override >> $@ 39 echo CONFIG += no-override >> $@
35endif 40endif
36ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) 41ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
37 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ 42 echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
38endif 43endif
diff --git a/include.pro b/include.pro
index c0019b0..c19e2f0 100644
--- a/include.pro
+++ b/include.pro
@@ -107,13 +107,13 @@ LIBS -= -lm
107else { 107else {
108QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 108QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
109# I am not sure whether it is a good idea to change the way plugins is build 109# I am not sure whether it is a good idea to change the way plugins is build
110# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X 110# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
111CONFIG -= plugin 111CONFIG -= plugin
112} 112}
113QMAKE_LIBDIR += $(OPIEDIR)/lib 113LIBS += -L$(OPIEDIR)/lib
114 114
115MOC_DIR=.moc/$(PLATFORM) 115MOC_DIR=.moc/$(PLATFORM)
116OBJECTS_DIR=.obj/$(PLATFORM) 116OBJECTS_DIR=.obj/$(PLATFORM)
117 117
118#was here now at thetop 118#was here now at thetop
119#include ( $(OPIEDIR)/gen.pro ) 119#include ( $(OPIEDIR)/gen.pro )
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro
index b341819..c328315 100644
--- a/libopie2/opiepim/opiepim.pro
+++ b/libopie2/opiepim/opiepim.pro
@@ -5,21 +5,24 @@ HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnoti
5 opimnotifymanager.h opimevent.h 5 opimnotifymanager.h opimevent.h
6 6
7SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ 7SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \
8 opimnotifymanager.cpp opimevent.cpp 8 opimnotifymanager.cpp opimevent.cpp
9INTERFACES = 9INTERFACES =
10TARGET = opiepim2 10TARGET = opiepim2
11VERSION = 1.8.3 11VERSION = 1.8.4
12INCLUDEPATH += $(OPIEDIR)/include 12INCLUDEPATH += $(OPIEDIR)/include
13DEPENDPATH += $(OPIEDIR)/include 13DEPENDPATH += $(OPIEDIR)/include
14LIBS += -lopiecore2 -lopiedb2 14LIBS += -lopiecore2
15 15
16include ( core/core.pro ) 16include ( core/core.pro )
17include ( core/backends/backends.pro ) 17include ( core/backends/backends.pro )
18include ( ui/ui.pro ) 18include ( ui/ui.pro )
19 19
20contains( ENABLE_SQL_PIM_BACKEND, y )
21 LIBS += -lopiedb2
22
20!contains( platform, x11 ) { 23!contains( platform, x11 ) {
21 include ( $(OPIEDIR)/include.pro ) 24 include ( $(OPIEDIR)/include.pro )
22} 25}
23 26
24contains( platform, x11 ) { 27contains( platform, x11 ) {
25 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 28 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib