-rw-r--r-- | Rules.make | 7 | ||||
-rw-r--r-- | include.pro | 2 | ||||
-rw-r--r-- | libopie2/opiepim/opiepim.pro | 7 |
3 files changed, 12 insertions, 4 deletions
@@ -20,25 +20,30 @@ else | |||
20 | endif | 20 | endif |
21 | ifneq ($(CONFIG_QUICK_LAUNCH),) | 21 | ifneq ($(CONFIG_QUICK_LAUNCH),) |
22 | echo contains\( CONFIG, quick-app \) \{ >> $@ | 22 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
23 | echo CONFIG -= quick-app >> $@ | 23 | echo CONFIG -= quick-app >> $@ |
24 | echo CONFIG += quick-app-lib >> $@ | 24 | echo CONFIG += quick-app-lib >> $@ |
25 | echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ | 25 | echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ |
26 | echo \} >> $@ | 26 | echo \} >> $@ |
27 | else | 27 | else |
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 | 32 | endif |
33 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) | ||
34 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ | ||
35 | else | ||
36 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ | ||
37 | endif | ||
33 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) | 38 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
34 | echo CONFIG += no-override >> $@ | 39 | echo CONFIG += no-override >> $@ |
35 | endif | 40 | endif |
36 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) | 41 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
37 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ | 42 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
38 | endif | 43 | endif |
39 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) | 44 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) |
40 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ | 45 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ |
41 | endif | 46 | endif |
42 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) | 47 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) |
43 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ | 48 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ |
44 | endif | 49 | endif |
diff --git a/include.pro b/include.pro index c0019b0..c19e2f0 100644 --- a/include.pro +++ b/include.pro | |||
@@ -101,19 +101,19 @@ CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | |||
101 | contains( CONFTEST, y ){ | 101 | contains( CONFTEST, y ){ |
102 | QMAKE_LFLAGS += -Wl | 102 | QMAKE_LFLAGS += -Wl |
103 | LIBS -= -ldl | 103 | LIBS -= -ldl |
104 | LIBS -= -lcrypt | 104 | LIBS -= -lcrypt |
105 | LIBS -= -lm | 105 | LIBS -= -lm |
106 | } | 106 | } |
107 | else { | 107 | else { |
108 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 108 | QMAKE_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 |
111 | CONFIG -= plugin | 111 | CONFIG -= plugin |
112 | } | 112 | } |
113 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 113 | LIBS += -L$(OPIEDIR)/lib |
114 | 114 | ||
115 | MOC_DIR=.moc/$(PLATFORM) | 115 | MOC_DIR=.moc/$(PLATFORM) |
116 | OBJECTS_DIR=.obj/$(PLATFORM) | 116 | OBJECTS_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 | |||
@@ -1,27 +1,30 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on debug | 2 | CONFIG += qt warn_on debug |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ | 4 | HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnotify.h \ |
5 | opimnotifymanager.h opimevent.h | 5 | opimnotifymanager.h opimevent.h |
6 | 6 | ||
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.3 | 11 | VERSION = 1.8.4 |
12 | INCLUDEPATH += $(OPIEDIR)/include | 12 | INCLUDEPATH += $(OPIEDIR)/include |
13 | DEPENDPATH += $(OPIEDIR)/include | 13 | DEPENDPATH += $(OPIEDIR)/include |
14 | LIBS += -lopiecore2 -lopiedb2 | 14 | LIBS += -lopiecore2 |
15 | 15 | ||
16 | include ( core/core.pro ) | 16 | include ( core/core.pro ) |
17 | include ( core/backends/backends.pro ) | 17 | include ( core/backends/backends.pro ) |
18 | include ( ui/ui.pro ) | 18 | include ( ui/ui.pro ) |
19 | 19 | ||
20 | contains( 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 | ||
24 | contains( platform, x11 ) { | 27 | contains( platform, x11 ) { |
25 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 28 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
26 | } | 29 | } |
27 | 30 | ||