summaryrefslogtreecommitdiff
authoreilers <eilers>2004-03-31 18:09:23 (UTC)
committer eilers <eilers>2004-03-31 18:09:23 (UTC)
commit4910b98d6fc0725337b494a03fa05e18209b99e3 (patch) (unidiff)
treeb6b6b18dc31da4d0ed4e4f7ec596a3f9a8599696
parentf878d5938aadaa967800032ab985210f85ad6ae7 (diff)
downloadopie-4910b98d6fc0725337b494a03fa05e18209b99e3.zip
opie-4910b98d6fc0725337b494a03fa05e18209b99e3.tar.gz
opie-4910b98d6fc0725337b494a03fa05e18209b99e3.tar.bz2
Removed all unnecessary dependencies to libopiedb2 and reimplemented
the conditional compilation of the SQL implementation. Therefore, it is possible to remove all dependencies of libsqlite and libopiedb2 etc. just by disabling the SQL support in the configuration ! If disabled, the usual xml-immplementation is used. Thanks to mickeyl who already fixed the "backends.pro" ..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.pro2
-rw-r--r--core/pim/addressbook/config.in2
-rw-r--r--core/pim/datebook/datebook.pro2
-rw-r--r--core/pim/today/plugins/addressbook/addressbook.pro2
-rw-r--r--core/pim/today/plugins/addressbook/config.in4
-rw-r--r--core/pim/todo/config.in2
-rw-r--r--core/pim/todo/todo.pro2
-rw-r--r--include.pro17
-rw-r--r--libopie2/opiepim/config.in6
-rw-r--r--packages1
10 files changed, 25 insertions, 15 deletions
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 8bf19f5..b27e4b8 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -1,28 +1,28 @@
1 #CONFIG = qt warn_on quick-app 1 #CONFIG = qt warn_on quick-app
2 CONFIG = qt warn_on quick-app 2 CONFIG = qt warn_on quick-app
3 HEADERS= addressbook.h \ 3 HEADERS= addressbook.h \
4 contacteditor.h \ 4 contacteditor.h \
5 ablabel.h \ 5 ablabel.h \
6 abtable.h \ 6 abtable.h \
7 picker.h \ 7 picker.h \
8 ofloatbar.h \ 8 ofloatbar.h \
9 configdlg.h \ 9 configdlg.h \
10 abconfig.h \ 10 abconfig.h \
11 abview.h 11 abview.h
12 SOURCES= main.cpp \ 12 SOURCES= main.cpp \
13 addressbook.cpp \ 13 addressbook.cpp \
14 contacteditor.cpp \ 14 contacteditor.cpp \
15 ablabel.cpp \ 15 ablabel.cpp \
16 abtable.cpp \ 16 abtable.cpp \
17 picker.cpp \ 17 picker.cpp \
18 configdlg.cpp \ 18 configdlg.cpp \
19 abconfig.cpp \ 19 abconfig.cpp \
20 abview.cpp 20 abview.cpp
21 21
22 INTERFACES= configdlg_base.ui 22 INTERFACES= configdlg_base.ui
23 TARGET = addressbook 23 TARGET = addressbook
24INCLUDEPATH += $(OPIEDIR)/include 24INCLUDEPATH += $(OPIEDIR)/include
25 DEPENDPATH+= $(OPIEDIR)/include 25 DEPENDPATH+= $(OPIEDIR)/include
26LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 26LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2
27 27
28include ( $(OPIEDIR)/include.pro ) 28include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/addressbook/config.in b/core/pim/addressbook/config.in
index 7ecf14c..ab16fef 100644
--- a/core/pim/addressbook/config.in
+++ b/core/pim/addressbook/config.in
@@ -1,4 +1,4 @@
1 config ADDRESSBOOK 1 config ADDRESSBOOK
2 boolean "opie-addressbook (a simple addressbook)" 2 boolean "opie-addressbook (a simple addressbook)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 8fbc1ca..bf9a2cc 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -1,41 +1,41 @@
1 CONFIG += qt warn_on quick-app 1 CONFIG += qt warn_on quick-app
2 HEADERS= datebookday.h \ 2 HEADERS= datebookday.h \
3 datebook.h \ 3 datebook.h \
4 dateentryimpl.h \ 4 dateentryimpl.h \
5 datebookdayheaderimpl.h \ 5 datebookdayheaderimpl.h \
6 datebooksettings.h \ 6 datebooksettings.h \
7 datebookweek.h \ 7 datebookweek.h \
8 datebookweeklst.h \ 8 datebookweeklst.h \
9 datebookweekheaderimpl.h \ 9 datebookweekheaderimpl.h \
10 repeatentry.h \ 10 repeatentry.h \
11 noteentryimpl.h \ 11 noteentryimpl.h \
12 onoteedit.h \ 12 onoteedit.h \
13 datebookdayallday.h \ 13 datebookdayallday.h \
14 namespace_hack.h 14 namespace_hack.h
15 SOURCES= main.cpp \ 15 SOURCES= main.cpp \
16 datebookday.cpp \ 16 datebookday.cpp \
17 datebook.cpp \ 17 datebook.cpp \
18 dateentryimpl.cpp \ 18 dateentryimpl.cpp \
19 datebookdayheaderimpl.cpp \ 19 datebookdayheaderimpl.cpp \
20 datebooksettings.cpp \ 20 datebooksettings.cpp \
21 datebookweek.cpp \ 21 datebookweek.cpp \
22 datebookweeklst.cpp \ 22 datebookweeklst.cpp \
23 datebookweekheaderimpl.cpp \ 23 datebookweekheaderimpl.cpp \
24 repeatentry.cpp \ 24 repeatentry.cpp \
25 noteentryimpl.cpp \ 25 noteentryimpl.cpp \
26 onoteedit.cpp \ 26 onoteedit.cpp \
27 datebookdayallday.cpp 27 datebookdayallday.cpp
28 INTERFACES= dateentry.ui \ 28 INTERFACES= dateentry.ui \
29 datebookdayheader.ui \ 29 datebookdayheader.ui \
30 datebookweekheader.ui \ 30 datebookweekheader.ui \
31 datebookweeklstheader.ui \ 31 datebookweeklstheader.ui \
32 datebookweeklstdayhdr.ui \ 32 datebookweeklstdayhdr.ui \
33 repeatentrybase.ui \ 33 repeatentrybase.ui \
34 datebooksettingsbase.ui \ 34 datebooksettingsbase.ui \
35 noteentry.ui 35 noteentry.ui
36INCLUDEPATH += $(OPIEDIR)/include 36INCLUDEPATH += $(OPIEDIR)/include
37 DEPENDPATH+= $(OPIEDIR)/include 37 DEPENDPATH+= $(OPIEDIR)/include
38LIBS += -lqpe -lopieui2 38LIBS += -lqpe -lopieui2 -lopiecore2
39 TARGET = datebook 39 TARGET = datebook
40 40
41include ( $(OPIEDIR)/include.pro ) 41include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/addressbook/addressbook.pro b/core/pim/today/plugins/addressbook/addressbook.pro
index 7804297..3877fad 100644
--- a/core/pim/today/plugins/addressbook/addressbook.pro
+++ b/core/pim/today/plugins/addressbook/addressbook.pro
@@ -1,21 +1,21 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG -= moc 2CONFIG -= moc
3CONFIG += qt plugin 3CONFIG += qt plugin
4 4
5# Input 5# Input
6HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \ 6HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \
7 addresspluginwidget.h 7 addresspluginwidget.h
8SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \ 8SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \
9 addresspluginwidget.cpp 9 addresspluginwidget.cpp
10 10
11INCLUDEPATH += $(OPIEDIR)/include \ 11INCLUDEPATH += $(OPIEDIR)/include \
12 ../ ../library 12 ../ ../library
13DEPENDPATH += $(OPIEDIR)/include \ 13DEPENDPATH += $(OPIEDIR)/include \
14 ../ ../library 14 ../ ../library
15 15
16LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2 16LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2
17 17
18DESTDIR = $(OPIEDIR)/plugins/today 18DESTDIR = $(OPIEDIR)/plugins/today
19TARGET = todayaddressbookplugin 19TARGET = todayaddressbookplugin
20 20
21include ( $(OPIEDIR)/include.pro ) 21include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/addressbook/config.in b/core/pim/today/plugins/addressbook/config.in
index 33e8b6d..c212064 100644
--- a/core/pim/today/plugins/addressbook/config.in
+++ b/core/pim/today/plugins/addressbook/config.in
@@ -1,7 +1,7 @@
1 config TODAY_ADDRESSBOOK 1 config TODAY_ADDRESSBOOK
2 boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)" 2 boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX
5 5
6 comment "opie-today-addressbookplugin requires libopie2core, libopie2ui, libopie2pim, libopie2db and libqtaux" 6 comment "opie-today-addressbookplugin requires libopie2core, libopie2ui, libopie2pim, libopie2db and libqtaux"
7 depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX ) 7 depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX )
diff --git a/core/pim/todo/config.in b/core/pim/todo/config.in
index 6904174..45c4558 100644
--- a/core/pim/todo/config.in
+++ b/core/pim/todo/config.in
@@ -1,4 +1,4 @@
1 config TODO 1 config TODO
2 boolean "opie-todo (a Todo-list manager)" 2 boolean "opie-todo (a Todo-list manager)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro
index 1271d2d..eea5db7 100644
--- a/core/pim/todo/todo.pro
+++ b/core/pim/todo/todo.pro
@@ -1,49 +1,49 @@
1 #TEMPLATE= app 1 #TEMPLATE= app
2 CONFIG = qt warn_on quick-app 2 CONFIG = qt warn_on quick-app
3 #DESTDIR = $(OPIEDIR)/bin 3 #DESTDIR = $(OPIEDIR)/bin
4 4
5 HEADERS= smalltodo.h \ 5 HEADERS= smalltodo.h \
6 todomanager.h \ 6 todomanager.h \
7 mainwindow.h \ 7 mainwindow.h \
8 todoview.h \ 8 todoview.h \
9 tableview.h \ 9 tableview.h \
10 todotemplatemanager.h \ 10 todotemplatemanager.h \
11 todoeditor.h \ 11 todoeditor.h \
12 todoshow.h \ 12 todoshow.h \
13 textviewshow.h \ 13 textviewshow.h \
14 templateeditor.h \ 14 templateeditor.h \
15 templatedialog.h \ 15 templatedialog.h \
16 templatedialogimpl.h \ 16 templatedialogimpl.h \
17 quickedit.h \ 17 quickedit.h \
18 quickeditimpl.h \ 18 quickeditimpl.h \
19 otaskeditor.h \ 19 otaskeditor.h \
20 taskeditoroverview.h \ 20 taskeditoroverview.h \
21 taskeditorstatus.h \ 21 taskeditorstatus.h \
22 taskeditoralarms.h 22 taskeditoralarms.h
23 23
24 SOURCES= smalltodo.cpp \ 24 SOURCES= smalltodo.cpp \
25 todomanager.cpp \ 25 todomanager.cpp \
26 mainwindow.cpp \ 26 mainwindow.cpp \
27 # main.cpp \ 27 # main.cpp \
28 tableview.cpp \ 28 tableview.cpp \
29 todoview.cpp \ 29 todoview.cpp \
30 todotemplatemanager.cpp \ 30 todotemplatemanager.cpp \
31 todoeditor.cpp \ 31 todoeditor.cpp \
32 todoshow.cpp \ 32 todoshow.cpp \
33 textviewshow.cpp \ 33 textviewshow.cpp \
34 templateeditor.cpp \ 34 templateeditor.cpp \
35 templatedialog.cpp \ 35 templatedialog.cpp \
36 templatedialogimpl.cpp \ 36 templatedialogimpl.cpp \
37 quickeditimpl.cpp \ 37 quickeditimpl.cpp \
38 quickedit.cpp \ 38 quickedit.cpp \
39 otaskeditor.cpp \ 39 otaskeditor.cpp \
40 taskeditoroverview.cpp \ 40 taskeditoroverview.cpp \
41 taskeditorstatus.cpp \ 41 taskeditorstatus.cpp \
42 taskeditoralarms.cpp 42 taskeditoralarms.cpp
43 43
44 TARGET = todolist 44 TARGET = todolist
45INCLUDEPATH += $(OPIEDIR)/include 45INCLUDEPATH += $(OPIEDIR)/include
46 DEPENDPATH+= $(OPIEDIR)/include 46 DEPENDPATH+= $(OPIEDIR)/include
47LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 47LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2
48 48
49include ( $(OPIEDIR)/include.pro ) 49include ( $(OPIEDIR)/include.pro )
diff --git a/include.pro b/include.pro
index c19e2f0..ced5c9f 100644
--- a/include.pro
+++ b/include.pro
@@ -6,114 +6,123 @@ prefix = $(OPIEDIR)
6 6
7contains( CONFIG, quick-app-lib ) { 7contains( CONFIG, quick-app-lib ) {
8 TEMPLATE = lib 8 TEMPLATE = lib
9 CONFIG += plugin # "plugin" will be removed automatically later if not MacOSX ! (eilers) 9 CONFIG += plugin # "plugin" will be removed automatically later if not MacOSX ! (eilers)
10 DESTDIR = $(OPIEDIR)/plugins/application 10 DESTDIR = $(OPIEDIR)/plugins/application
11 DEFINES += OPIE_APP_INTERFACE 11 DEFINES += OPIE_APP_INTERFACE
12 !contains( TARGET, launcher ) { 12 !contains( TARGET, launcher ) {
13 message( Linking $$TARGET to quicklauncher ) 13 message( Linking $$TARGET to quicklauncher )
14 system( rm -f $$(OPIEDIR)/bin/$$TARGET ) 14 system( rm -f $$(OPIEDIR)/bin/$$TARGET )
15 system( ln -sf $$QUICKLAUNCH_PATH $$(OPIEDIR)/bin/$$TARGET ) 15 system( ln -sf $$QUICKLAUNCH_PATH $$(OPIEDIR)/bin/$$TARGET )
16 } 16 }
17} 17}
18 18
19contains ( CONFIG, quick-app-bin ) { 19contains ( CONFIG, quick-app-bin ) {
20 TEMPLATE = app 20 TEMPLATE = app
21 DESTDIR = $(OPIEDIR)/bin 21 DESTDIR = $(OPIEDIR)/bin
22 DEFINES -= OPIE_APP_INTERFACE 22 DEFINES -= OPIE_APP_INTERFACE
23 message( Touching plugins/application/lib$${TARGET}.so.0 ) 23 message( Touching plugins/application/lib$${TARGET}.so.0 )
24 system( touch $$(OPIEDIR)/plugins/application/lib$${TARGET}.so.0 ) 24 system( touch $$(OPIEDIR)/plugins/application/lib$${TARGET}.so.0 )
25} 25}
26 26
27 27
28contains( TEMPLATE, lib ) { 28contains( TEMPLATE, lib ) {
29 target.path = $$prefix/lib 29 target.path = $$prefix/lib
30} 30}
31!contains( TEMPLATE, lib ) { 31!contains( TEMPLATE, lib ) {
32 target.path = $$prefix/bin 32 target.path = $$prefix/bin
33} 33}
34INSTALLS += target 34INSTALLS += target
35 35
36# ipkg control files 36# ipkg control files
37control.path = /CONTROL 37control.path = /CONTROL
38control.files = control postinst prerm postrm preinst conffiles 38control.files = control postinst prerm postrm preinst conffiles
39INSTALLS += control 39INSTALLS += control
40 40
41# images, default is $$prefix/pics/$$TARGET 41# images, default is $$prefix/pics/$$TARGET
42pics.path = $$prefix/pics/$$TARGET 42pics.path = $$prefix/pics/$$TARGET
43pics.files = pics/* 43pics.files = pics/*
44INSTALLS += pics 44INSTALLS += pics
45 45
46# sounds, default path is $$prefix/sounds/$$TARGET 46# sounds, default path is $$prefix/sounds/$$TARGET
47sounds.path = $$prefix/sounds/$$TARGET 47sounds.path = $$prefix/sounds/$$TARGET
48sounds.files = sounds/* 48sounds.files = sounds/*
49INSTALLS += sounds 49INSTALLS += sounds
50 50
51# init scripts, default path is /etc/init.d 51# init scripts, default path is /etc/init.d
52init.path = /etc/init.d 52init.path = /etc/init.d
53init.files = init.d/* 53init.files = init.d/*
54INSTALLS += init 54INSTALLS += init
55 55
56# data, default path is /usr/share/$$TARGET 56# data, default path is /usr/share/$$TARGET
57data.path = /usr/share/$$TARGET 57data.path = /usr/share/$$TARGET
58data.files = share/* 58data.files = share/*
59INSTALLS += data 59INSTALLS += data
60 60
61etc.path = $$prefix/etc/ 61etc.path = $$prefix/etc/
62etc.files = etc/* 62etc.files = etc/*
63INSTALLS += etc 63INSTALLS += etc
64 64
65apps.path = $$prefix/apps/ 65apps.path = $$prefix/apps/
66apps.files = apps/* 66apps.files = apps/*
67INSTALLS += apps 67INSTALLS += apps
68 68
69# sounds, default path is $$prefix/sounds/$$TARGET 69# sounds, default path is $$prefix/sounds/$$TARGET
70sounds.path = $$prefix/sounds/$$TARGET 70sounds.path = $$prefix/sounds/$$TARGET
71sounds.files = sounds/* 71sounds.files = sounds/*
72INSTALLS += sounds 72INSTALLS += sounds
73 73
74# anything in nonstandard paths 74# anything in nonstandard paths
75root.path = / 75root.path = /
76root.files = root/* 76root.files = root/*
77INSTALLS += root 77INSTALLS += root
78 78
79# new targets 79# new targets
80opie-lupdate.target = opie-lupdate 80opie-lupdate.target = opie-lupdate
81opie-lupdate.commands = opie-lupdate $(PRO) 81opie-lupdate.commands = opie-lupdate $(PRO)
82 82
83opie-lrelease.target = opie-lrelease 83opie-lrelease.target = opie-lrelease
84opie-lrelease.commands = opie-lrelease $(PRO) 84opie-lrelease.commands = opie-lrelease $(PRO)
85 85
86lupdate.target = lupdate 86lupdate.target = lupdate
87lupdate.commands = lupdate -noobsolete $(PRO) 87lupdate.commands = lupdate -noobsolete $(PRO)
88 88
89lrelease.target = lrelease 89lrelease.target = lrelease
90lrelease.commands = lrelease $(PRO) 90lrelease.commands = lrelease $(PRO)
91 91
92# new message target to get all strings from the apps with and without tr 92# new message target to get all strings from the apps with and without tr
93messages.target = messages 93messages.target = messages
94messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po' 94messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po'
95 95
96ipk.target = ipk 96ipk.target = ipk
97ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 97ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
98 98
99QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages 99QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
100CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) 100CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
101contains( CONFTEST, y ){ 101contains( CONFTEST, y ){
102QMAKE_LFLAGS += -Wl 102 QMAKE_LFLAGS += -Wl
103LIBS -= -ldl 103 LIBS -= -ldl
104LIBS -= -lcrypt 104 LIBS -= -lcrypt
105LIBS -= -lm 105 LIBS -= -lm
106
107 # Manual including indirect referenced libraries which are not loaded
108 # by the mac-linker automatically
109 CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND )
110 contains( CONFTEST, y ){
111 LIBS += -lopiedb2 -lqpe
112 } else {
113 LIBS += -lqpe
114 }
106} 115}
107else { 116else {
108QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 117QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
109# I am not sure whether it is a good idea to change the way plugins is build 118# 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 119# on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X
111CONFIG -= plugin 120CONFIG -= plugin
112} 121}
113LIBS += -L$(OPIEDIR)/lib 122LIBS += -L$(OPIEDIR)/lib
114 123
115MOC_DIR=.moc/$(PLATFORM) 124MOC_DIR=.moc/$(PLATFORM)
116OBJECTS_DIR=.obj/$(PLATFORM) 125OBJECTS_DIR=.obj/$(PLATFORM)
117 126
118#was here now at thetop 127#was here now at thetop
119#include ( $(OPIEDIR)/gen.pro ) 128#include ( $(OPIEDIR)/gen.pro )
diff --git a/libopie2/opiepim/config.in b/libopie2/opiepim/config.in
index fb75fcc..2c920bb 100644
--- a/libopie2/opiepim/config.in
+++ b/libopie2/opiepim/config.in
@@ -1,21 +1,21 @@
1 config LIBOPIE2PIM 1 config LIBOPIE2PIM
2 boolean "libopie2pim (pim related classes)" 2 boolean "libopie2pim (pim related classes)"
3 default "n" 3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
5 comment "libopie2pim needs a libqpe and libopie2core and libopie2db" 5 comment "libopie2pim needs a libqpe and libopie2core"
6 depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB) 6 depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE )
7 7
8 config SQL_PIM_BACKEND 8 config SQL_PIM_BACKEND
9 boolean "Enable SQL Backend for libopie2pim" 9 boolean "Enable SQL Backend for libopie2pim"
10 default n 10 default n
11 help 11 help
12 This adds the SQL-Support, using SQLite. Which database is used 12 This adds the SQL-Support, using SQLite. Which database is used
13 by the backends is defined by the file "pimaccess.conf" in the 13 by the backends is defined by the file "pimaccess.conf" in the
14 directory "Settings". 14 directory "Settings".
15 There currently do exist to groups "[contact]" and "[todo]". You can 15 There currently do exist to groups "[contact]" and "[todo]". You can
16 select the used backend by the variable "usebackend=<type>", where 16 select the used backend by the variable "usebackend=<type>", where
17 <type> is "sql" or "xml". "xml" is the default ! 17 <type> is "sql" or "xml". "xml" is the default !
18 Important: The SQLite-library "libsqlite.so" must be installed ! 18 Important: The SQLite-library "libsqlite.so" must be installed !
19 depends ( LIBOPIE2DB ) 19 depends ( LIBOPIE2DB )
20 comment "SQL-Support needs libopie2db (and libsqlite)" 20 comment "SQL-Support needs libopie2db (and libsqlite)"
21 depends !( LIBOPIE2DB ) 21 depends !( LIBOPIE2DB )
diff --git a/packages b/packages
index da2a9d9..a11e6a0 100644
--- a/packages
+++ b/packages
@@ -1,128 +1,129 @@
1 CONFIG_ABOUTAPPLET core/applets/aboutappletaboutapplet.pro 1 CONFIG_ABOUTAPPLET core/applets/aboutappletaboutapplet.pro
2 CONFIG_ADDRESSBOOK core/pim/addressbookaddressbook.pro 2 CONFIG_ADDRESSBOOK core/pim/addressbookaddressbook.pro
3 CONFIG_ADVANCEDFM noncore/apps/advancedfmadvancedfm.pro 3 CONFIG_ADVANCEDFM noncore/apps/advancedfmadvancedfm.pro
4 CONFIG_APPEARANCE2 noncore/settings/appearance2appearance2.pro 4 CONFIG_APPEARANCE2 noncore/settings/appearance2appearance2.pro
5CONFIG_APPLET_EXAMPLE examples/applet example.pro 5CONFIG_APPLET_EXAMPLE examples/applet example.pro
6 CONFIG_APPSKEY noncore/settings/appskeyappskey.pro 6 CONFIG_APPSKEY noncore/settings/appskeyappskey.pro
7 CONFIG_AQPKG noncore/settings/aqpkgaqpkg.pro 7 CONFIG_AQPKG noncore/settings/aqpkgaqpkg.pro
8 CONFIG_AUTOROTATEAPPLET noncore/applets/autorotateappletautorotateapplet.pro 8 CONFIG_AUTOROTATEAPPLET noncore/applets/autorotateappletautorotateapplet.pro
9 CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro 9 CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
10 CONFIG_BACKUP noncore/settings/backupbackup.pro 10 CONFIG_BACKUP noncore/settings/backupbackup.pro
11 CONFIG_BARTENDER noncore/apps/opie-bartenderbartender.pro 11 CONFIG_BARTENDER noncore/apps/opie-bartenderbartender.pro
12 CONFIG_BATTERYAPPLET core/applets/batteryappletbatteryapplet.pro 12 CONFIG_BATTERYAPPLET core/applets/batteryappletbatteryapplet.pro
13 CONFIG_BEND noncore/unsupported/mail2/bendbend.pro 13 CONFIG_BEND noncore/unsupported/mail2/bendbend.pro
14CONFIG_BIGSCREEN_EXAMPLE libopie/big-screen/example osplitter_mail.pro 14CONFIG_BIGSCREEN_EXAMPLE libopie/big-screen/example osplitter_mail.pro
15 CONFIG_BINARY noncore/tools/calc2/binarybinary.pro 15 CONFIG_BINARY noncore/tools/calc2/binarybinary.pro
16 CONFIG_BLUE-PIN noncore/net/opietooth/blue-pinblue-pin.pro 16 CONFIG_BLUE-PIN noncore/net/opietooth/blue-pinblue-pin.pro
17 CONFIG_BOUNCE noncore/games/bouncebounce.pro 17 CONFIG_BOUNCE noncore/games/bouncebounce.pro
18 CONFIG_BUTTON-SETTINGS core/settings/buttonbutton.pro 18 CONFIG_BUTTON-SETTINGS core/settings/buttonbutton.pro
19 CONFIG_BUZZWORD noncore/games/buzzwordbuzzword.pro 19 CONFIG_BUZZWORD noncore/games/buzzwordbuzzword.pro
20 CONFIG_CALC2 noncore/tools/calc2calc.pro 20 CONFIG_CALC2 noncore/tools/calc2calc.pro
21 CONFIG_CALCULATOR noncore/tools/calculatorcalculator.pro 21 CONFIG_CALCULATOR noncore/tools/calculatorcalculator.pro
22 CONFIG_CALIBRATE core/apps/calibratecalibrate.pro 22 CONFIG_CALIBRATE core/apps/calibratecalibrate.pro
23 CONFIG_CAMERA noncore/multimedia/cameracamera.pro 23 CONFIG_CAMERA noncore/multimedia/cameracamera.pro
24 CONFIG_CARDMON core/applets/cardmoncardmon.pro 24 CONFIG_CARDMON core/applets/cardmoncardmon.pro
25 CONFIG_CHECKBOOK noncore/apps/checkbookcheckbook.pro 25 CONFIG_CHECKBOOK noncore/apps/checkbookcheckbook.pro
26 CONFIG_CITYTIME core/settings/citytimecitytime.pro 26 CONFIG_CITYTIME core/settings/citytimecitytime.pro
27 CONFIG_CLIPBOARDAPPLET core/applets/clipboardappletclipboardapplet.pro 27 CONFIG_CLIPBOARDAPPLET core/applets/clipboardappletclipboardapplet.pro
28 CONFIG_CLOCKAPPLET core/applets/clockappletclockapplet.pro 28 CONFIG_CLOCKAPPLET core/applets/clockappletclockapplet.pro
29 CONFIG_CLOCK noncore/tools/clockclock.pro 29 CONFIG_CLOCK noncore/tools/clockclock.pro
30 CONFIG_CONFEDIT noncore/apps/confeditconfedit.pro 30 CONFIG_CONFEDIT noncore/apps/confeditconfedit.pro
31 CONFIG_DASHER inputmethods/dasherdasher.pro 31 CONFIG_DASHER inputmethods/dasherdasher.pro
32 CONFIG_DATEBOOK core/pim/datebookdatebook.pro 32 CONFIG_DATEBOOK core/pim/datebookdatebook.pro
33 CONFIG_DATEBOOK2 core/pim/datebook2datebook2.pro
33 CONFIG_DECO_FLAT noncore/decorations/flatflat.pro 34 CONFIG_DECO_FLAT noncore/decorations/flatflat.pro
34 CONFIG_DECO_LIQUID noncore/decorations/liquidliquid.pro 35 CONFIG_DECO_LIQUID noncore/decorations/liquidliquid.pro
35 CONFIG_DECO_POLISHED noncore/decorations/polishedpolished.pro 36 CONFIG_DECO_POLISHED noncore/decorations/polishedpolished.pro
36 CONFIG_DICTIONARY noncore/apps/dictionarydictionary.pro 37 CONFIG_DICTIONARY noncore/apps/dictionarydictionary.pro
37CONFIG_DOCTAB noncore/settings/doctab doctab.pro 38CONFIG_DOCTAB noncore/settings/doctab doctab.pro
38 CONFIG_DRAWPAD noncore/graphics/drawpaddrawpad.pro 39 CONFIG_DRAWPAD noncore/graphics/drawpaddrawpad.pro
39 CONFIG_DVORAK inputmethods/dvorakdvorak.pro 40 CONFIG_DVORAK inputmethods/dvorakdvorak.pro
40 CONFIG_EMBEDDEDKONSOLE core/apps/embeddedkonsoleembeddedkonsole.pro 41 CONFIG_EMBEDDEDKONSOLE core/apps/embeddedkonsoleembeddedkonsole.pro
41 CONFIG_EUROCONV noncore/tools/euroconv/ euroconv.pro 42 CONFIG_EUROCONV noncore/tools/euroconv/ euroconv.pro
42CONFIG_EXAMPLE_BOARD examples/inputmethod example.pro 43CONFIG_EXAMPLE_BOARD examples/inputmethod example.pro
43CONFIG_EXAMPLE_MENU examples/menuapplet menuapplet.pro 44CONFIG_EXAMPLE_MENU examples/menuapplet menuapplet.pro
44CONFIG_EXAMPLE_VPN examples/networksettings example.pro 45CONFIG_EXAMPLE_VPN examples/networksettings example.pro
45 CONFIG_FIFTEEN noncore/games/fifteenfifteen.pro 46 CONFIG_FIFTEEN noncore/games/fifteenfifteen.pro
46 CONFIG_FILEBROWSER noncore/unsupported/filebrowserfilebrowser.pro 47 CONFIG_FILEBROWSER noncore/unsupported/filebrowserfilebrowser.pro
47 CONFIG_FLAT noncore/styles/flatflat.pro 48 CONFIG_FLAT noncore/styles/flatflat.pro
48 CONFIG_FORMATTER noncore/tools/formatterformatter.pro 49 CONFIG_FORMATTER noncore/tools/formatterformatter.pro
49 CONFIG_FREETYPE freetypefreetype.pro 50 CONFIG_FREETYPE freetypefreetype.pro
50 CONFIG_FRESH noncore/styles/freshfresh.pro 51 CONFIG_FRESH noncore/styles/freshfresh.pro
51 CONFIG_FTPLIB noncore/net/ftplibftplib.pro 52 CONFIG_FTPLIB noncore/net/ftplibftplib.pro
52 CONFIG_GO noncore/games/gogo.pro 53 CONFIG_GO noncore/games/gogo.pro
53 CONFIG_GSMTOOL noncore/unsupported/gsmtoolgsmtool.pro 54 CONFIG_GSMTOOL noncore/unsupported/gsmtoolgsmtool.pro
54 CONFIG_HANDWRITING inputmethods/handwritinghandwriting.pro 55 CONFIG_HANDWRITING inputmethods/handwritinghandwriting.pro
55 CONFIG_HELPBROWSER core/apps/helpbrowserhelpbrowser.pro 56 CONFIG_HELPBROWSER core/apps/helpbrowserhelpbrowser.pro
56 CONFIG_HOMEAPPLET core/applets/homeapplethomeapplet.pro 57 CONFIG_HOMEAPPLET core/applets/homeapplethomeapplet.pro
57 CONFIG_INTERFACES noncore/settings/networksettings/interfacesinterfaces.pro 58 CONFIG_INTERFACES noncore/settings/networksettings/interfacesinterfaces.pro
58 CONFIG_IRDAAPPLET core/applets/irdaappletirdaapplet.pro 59 CONFIG_IRDAAPPLET core/applets/irdaappletirdaapplet.pro
59 CONFIG_JUMPX inputmethods/jumpxjumpx.pro 60 CONFIG_JUMPX inputmethods/jumpxjumpx.pro
60 CONFIG_KBILL noncore/games/kbillkbill.pro 61 CONFIG_KBILL noncore/games/kbillkbill.pro
61 CONFIG_KCHECKERS noncore/games/kcheckerskcheckers.pro 62 CONFIG_KCHECKERS noncore/games/kcheckerskcheckers.pro
62 CONFIG_KEYBOARD inputmethods/keyboardkeyboard.pro 63 CONFIG_KEYBOARD inputmethods/keyboardkeyboard.pro
63 CONFIG_KEYPEBBLE noncore/comm/keypebblekeypebble.pro 64 CONFIG_KEYPEBBLE noncore/comm/keypebblekeypebble.pro
64 CONFIG_KEYVIEW development/keyviewkeyview.pro 65 CONFIG_KEYVIEW development/keyviewkeyview.pro
65CONFIG_KEYZCFG noncore/apps/keyz-cfg keyz-cfg.pro 66CONFIG_KEYZCFG noncore/apps/keyz-cfg keyz-cfg.pro
66 CONFIG_KJUMPX inputmethods/kjumpxkjumpx.pro 67 CONFIG_KJUMPX inputmethods/kjumpxkjumpx.pro
67 CONFIG_KPACMAN noncore/games/kpacmankpacman.pro 68 CONFIG_KPACMAN noncore/games/kpacmankpacman.pro
68 CONFIG_LANGUAGE noncore/settings/languagelanguage.pro 69 CONFIG_LANGUAGE noncore/settings/languagelanguage.pro
69 CONFIG_LAUNCHER_CORE core/launcherserver.pro 70 CONFIG_LAUNCHER_CORE core/launcherserver.pro
70 CONFIG_LAUNCHER-SETTINGS core/settings/launcherlauncher.pro 71 CONFIG_LAUNCHER-SETTINGS core/settings/launcherlauncher.pro
71 CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeglibffmpeg.pro 72 CONFIG_LIBFFMPEG core/multimedia/opieplayer/libffmpeglibffmpeg.pro
72 CONFIG_LIBFLASH core/multimedia/opieplayer/libflashlibflash.pro 73 CONFIG_LIBFLASH core/multimedia/opieplayer/libflashlibflash.pro
73CONFIG_LIBKATE noncore/apps/tinykate/libkate libkate.pro 74CONFIG_LIBKATE noncore/apps/tinykate/libkate libkate.pro
74 CONFIG_LIBMAD core/multimedia/opieplayer/libmadlibmad.pro 75 CONFIG_LIBMAD core/multimedia/opieplayer/libmadlibmad.pro
75 CONFIG_LIBMAIL noncore/unsupported/mail2/libmaillibmail.pro 76 CONFIG_LIBMAIL noncore/unsupported/mail2/libmaillibmail.pro
76CONFIG_LIBMAILWRAPPER noncore/net/mail/libmailwrapper libmailwrapper.pro 77CONFIG_LIBMAILWRAPPER noncore/net/mail/libmailwrapper libmailwrapper.pro
77 CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3libmpeg3.pro 78 CONFIG_LIBMPEG3 core/multimedia/opieplayer/libmpeg3libmpeg3.pro
78 CONFIG_LIBOPIE2CORE libopie2/opiecoreopiecore.pro 79 CONFIG_LIBOPIE2CORE libopie2/opiecoreopiecore.pro
79 CONFIG_LIBOPIE2DB libopie2/opiedbopiedb.pro 80 CONFIG_LIBOPIE2DB libopie2/opiedbopiedb.pro
80 CONFIG_LIBOPIE2EXAMPLES libopie2/examplesexamples.pro 81 CONFIG_LIBOPIE2EXAMPLES libopie2/examplesexamples.pro
81 CONFIG_LIBOPIE2MM libopie2/opiemmopiemm.pro 82 CONFIG_LIBOPIE2MM libopie2/opiemmopiemm.pro
82 CONFIG_LIBOPIE2NET libopie2/opienetopienet.pro 83 CONFIG_LIBOPIE2NET libopie2/opienetopienet.pro
83 CONFIG_LIBOPIE2PIM libopie2/opiepimopiepim.pro 84 CONFIG_LIBOPIE2PIM libopie2/opiepimopiepim.pro
84 CONFIG_LIBOPIE2UI libopie2/opieuiopieui.pro 85 CONFIG_LIBOPIE2UI libopie2/opieuiopieui.pro
85 CONFIG_LIBOPIE libopielibopie.pro 86 CONFIG_LIBOPIE libopielibopie.pro
86 CONFIG_LIBOPIE_PIM libopie/pimpim.pro 87 CONFIG_LIBOPIE_PIM libopie/pimpim.pro
87 CONFIG_LIBOPIETOOTH noncore/net/opietooth/liblib.pro 88 CONFIG_LIBOPIETOOTH noncore/net/opietooth/liblib.pro
88 CONFIG_LIBQPE librarylibrary.pro 89 CONFIG_LIBQPE librarylibrary.pro
89 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro 90 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro
90 CONFIG_LIBQTAUX libqtauxlibqtaux.pro 91 CONFIG_LIBQTAUX libqtauxlibqtaux.pro
91 CONFIG_LIBSLCOMPAT libslcompatlibslcompat.pro 92 CONFIG_LIBSLCOMPAT libslcompatlibslcompat.pro
92 CONFIG_LIBSQL libsqllibsql.pro 93 CONFIG_LIBSQL libsqllibsql.pro
93CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro 94CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
94CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro 95CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro
95 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro 96 CONFIG_LIGHT-AND-POWER core/settings/light-and-powerlight-and-power.pro
96 CONFIG_LIQUID noncore/styles/liquidliquid.pro 97 CONFIG_LIQUID noncore/styles/liquidliquid.pro
97 CONFIG_LOGOUTAPPLET core/applets/logoutappletlogoutapplet.pro 98 CONFIG_LOGOUTAPPLET core/applets/logoutappletlogoutapplet.pro
98 CONFIG_MAIL3 noncore/net/mail mail.pro 99 CONFIG_MAIL3 noncore/net/mail mail.pro
99CONFIG_MAILAPPLET noncore/net/mail/taskbarapplet taskbarapplet.pro 100CONFIG_MAILAPPLET noncore/net/mail/taskbarapplet taskbarapplet.pro
100 CONFIG_MAILIT noncore/unsupported/mailit mailit.pro 101 CONFIG_MAILIT noncore/unsupported/mailit mailit.pro
101CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro 102CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro
102 CONFIG_MEDIUMMOUNT noncore/settings/mediummountmediummount.pro 103 CONFIG_MEDIUMMOUNT noncore/settings/mediummountmediummount.pro
103 CONFIG_MEMORYAPPLET noncore/applets/memoryappletmemoryapplet.pro 104 CONFIG_MEMORYAPPLET noncore/applets/memoryappletmemoryapplet.pro
104 CONFIG_METAL noncore/styles/metalmetal.pro 105 CONFIG_METAL noncore/styles/metalmetal.pro
105 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro 106 CONFIG_MINDBREAKER noncore/games/mindbreakermindbreaker.pro
106 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro 107 CONFIG_MINESWEEP noncore/games/minesweepminesweep.pro
107 CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro 108 CONFIG_MOBILEMSG noncore/comm/mobilemsgmobilemsg.pro
108 CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro 109 CONFIG_MODPLUG core/multimedia/opieplayer/modplugmodplug.pro
109 CONFIG_MULTIKEYAPPLET core/applets/multikeyappletmultikeyapplet.pro 110 CONFIG_MULTIKEYAPPLET core/applets/multikeyappletmultikeyapplet.pro
110 CONFIG_MULTIKEY inputmethods/multikeymultikey.pro 111 CONFIG_MULTIKEY inputmethods/multikeymultikey.pro
111 CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro 112 CONFIG_NETSYSTEMTIME noncore/settings/netsystemtimenetsystemtime.pro
112 CONFIG_NETWORKAPPLET noncore/applets/networkappletnetworkapplet.pro 113 CONFIG_NETWORKAPPLET noncore/applets/networkappletnetworkapplet.pro
113 CONFIG_NETWORKSETUP noncore/settings/networksettingsnetworksettings.pro 114 CONFIG_NETWORKSETUP noncore/settings/networksettingsnetworksettings.pro
114 CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro 115 CONFIG_NOTESAPPLET noncore/applets/notesappletnotesapplet.pro
115 CONFIG_OAPP core/apps/oappoapp.pro 116 CONFIG_OAPP core/apps/oappoapp.pro
116 CONFIG_OBEX core/applets/obex2obex.pro 117 CONFIG_OBEX core/applets/obex2obex.pro
117 CONFIG_ODICT noncore/apps/odictodict.pro 118 CONFIG_ODICT noncore/apps/odictodict.pro
118 CONFIG_OIPKG noncore/unsupported/oipkgoipkg.pro 119 CONFIG_OIPKG noncore/unsupported/oipkgoipkg.pro
119 CONFIG_OPIEALARMcore/opiealarm 120 CONFIG_OPIEALARMcore/opiealarm
120 CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro 121 CONFIG_OPIE-CONSOLE noncore/apps/opie-consoleopie-console.pro
121 CONFIG_OPIE_EYE noncore/graphics/opie-eyephunk_view.pro 122 CONFIG_OPIE_EYE noncore/graphics/opie-eyephunk_view.pro
122 CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slaveslave.pro 123 CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slaveslave.pro
123 CONFIG_OPIEFTP noncore/net/opieftpopieftp.pro 124 CONFIG_OPIEFTP noncore/net/opieftpopieftp.pro
124 CONFIG_OPIEIRC noncore/net/opieircopieirc.pro 125 CONFIG_OPIEIRC noncore/net/opieircopieirc.pro
125 CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro 126 CONFIG_OPIE-LOGIN core/opie-loginopie-login.pro
126 CONFIG_OPIEMAIL2noncore/unsupported/mail2 mail.pro 127 CONFIG_OPIEMAIL2noncore/unsupported/mail2 mail.pro
127 CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2opieplayer2.pro 128 CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2opieplayer2.pro
128 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro 129 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro