author | eilers <eilers> | 2004-03-31 18:09:23 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-03-31 18:09:23 (UTC) |
commit | 4910b98d6fc0725337b494a03fa05e18209b99e3 (patch) (side-by-side diff) | |
tree | b6b6b18dc31da4d0ed4e4f7ec596a3f9a8599696 | |
parent | f878d5938aadaa967800032ab985210f85ad6ae7 (diff) | |
download | opie-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" ..
-rw-r--r-- | core/pim/addressbook/addressbook.pro | 2 | ||||
-rw-r--r-- | core/pim/addressbook/config.in | 2 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/addressbook/addressbook.pro | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/addressbook/config.in | 4 | ||||
-rw-r--r-- | core/pim/todo/config.in | 2 | ||||
-rw-r--r-- | core/pim/todo/todo.pro | 2 | ||||
-rw-r--r-- | include.pro | 17 | ||||
-rw-r--r-- | libopie2/opiepim/config.in | 6 | ||||
-rw-r--r-- | packages | 1 |
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 @@ -10,19 +10,19 @@ HEADERS = addressbook.h \ abconfig.h \ abview.h SOURCES = main.cpp \ addressbook.cpp \ contacteditor.cpp \ ablabel.cpp \ abtable.cpp \ picker.cpp \ configdlg.cpp \ abconfig.cpp \ abview.cpp INTERFACES = configdlg_base.ui TARGET = addressbook INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 +LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 include ( $(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 @@ config ADDRESSBOOK boolean "opie-addressbook (a simple addressbook)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB + 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 @@ -22,20 +22,20 @@ SOURCES = main.cpp \ datebookweeklst.cpp \ datebookweekheaderimpl.cpp \ repeatentry.cpp \ noteentryimpl.cpp \ onoteedit.cpp \ datebookdayallday.cpp INTERFACES = dateentry.ui \ datebookdayheader.ui \ datebookweekheader.ui \ datebookweeklstheader.ui \ datebookweeklstdayhdr.ui \ repeatentrybase.ui \ datebooksettingsbase.ui \ noteentry.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopieui2 +LIBS += -lqpe -lopieui2 -lopiecore2 TARGET = datebook include ( $(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 @@ TEMPLATE = lib CONFIG -= moc CONFIG += qt plugin # Input HEADERS = addressplugin.h addresspluginimpl.h addresspluginconfig.h \ addresspluginwidget.h SOURCES = addressplugin.cpp addresspluginimpl.cpp addresspluginconfig.cpp \ addresspluginwidget.cpp INCLUDEPATH += $(OPIEDIR)/include \ ../ ../library DEPENDPATH += $(OPIEDIR)/include \ ../ ../library -LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 -lqtaux2 +LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lqtaux2 DESTDIR = $(OPIEDIR)/plugins/today TARGET = todayaddressbookplugin include ( $(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 @@ config TODAY_ADDRESSBOOK boolean "opie-today-addressbookplugin (shows Birthdays and Anniversaries)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBQTAUX comment "opie-today-addressbookplugin requires libopie2core, libopie2ui, libopie2pim, libopie2db and libqtaux" - depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB && LIBQTAUX ) + 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 @@ config TODO boolean "opie-todo (a Todo-list manager)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB + 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 @@ -31,19 +31,19 @@ SOURCES = smalltodo.cpp \ todoeditor.cpp \ todoshow.cpp \ textviewshow.cpp \ templateeditor.cpp \ templatedialog.cpp \ templatedialogimpl.cpp \ quickeditimpl.cpp \ quickedit.cpp \ otaskeditor.cpp \ taskeditoroverview.cpp \ taskeditorstatus.cpp \ taskeditoralarms.cpp TARGET = todolist INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2 +LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 include ( $(OPIEDIR)/include.pro ) diff --git a/include.pro b/include.pro index c19e2f0..ced5c9f 100644 --- a/include.pro +++ b/include.pro @@ -86,34 +86,43 @@ opie-lrelease.commands = opie-lrelease $(PRO) lupdate.target = lupdate lupdate.commands = lupdate -noobsolete $(PRO) lrelease.target = lrelease lrelease.commands = lrelease $(PRO) # new message target to get all strings from the apps with and without tr messages.target = messages messages.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' ipk.target = ipk ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) contains( CONFTEST, y ){ -QMAKE_LFLAGS += -Wl -LIBS -= -ldl -LIBS -= -lcrypt -LIBS -= -lm + QMAKE_LFLAGS += -Wl + LIBS -= -ldl + LIBS -= -lcrypt + LIBS -= -lm + + # Manual including indirect referenced libraries which are not loaded + # by the mac-linker automatically + CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) + contains( CONFTEST, y ){ + LIBS += -lopiedb2 -lqpe + } else { + LIBS += -lqpe + } } else { QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib # I am not sure whether it is a good idea to change the way plugins is build # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X CONFIG -= plugin } LIBS += -L$(OPIEDIR)/lib MOC_DIR=.moc/$(PLATFORM) OBJECTS_DIR=.obj/$(PLATFORM) #was here now at thetop #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 @@ config LIBOPIE2PIM boolean "libopie2pim (pim related classes)" default "n" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB - comment "libopie2pim needs a libqpe and libopie2core and libopie2db" - depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE + comment "libopie2pim needs a libqpe and libopie2core" + depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE ) config SQL_PIM_BACKEND boolean "Enable SQL Backend for libopie2pim" default n help This adds the SQL-Support, using SQLite. Which database is used by the backends is defined by the file "pimaccess.conf" in the directory "Settings". There currently do exist to groups "[contact]" and "[todo]". You can select the used backend by the variable "usebackend=<type>", where <type> is "sql" or "xml". "xml" is the default ! Important: The SQLite-library "libsqlite.so" must be installed ! depends ( LIBOPIE2DB ) comment "SQL-Support needs libopie2db (and libsqlite)" depends !( LIBOPIE2DB ) @@ -17,32 +17,33 @@ CONFIG_BLUE-PIN noncore/net/opietooth/blue-pin blue-pin.pro CONFIG_BOUNCE noncore/games/bounce bounce.pro CONFIG_BUTTON-SETTINGS core/settings/button button.pro CONFIG_BUZZWORD noncore/games/buzzword buzzword.pro CONFIG_CALC2 noncore/tools/calc2 calc.pro CONFIG_CALCULATOR noncore/tools/calculator calculator.pro CONFIG_CALIBRATE core/apps/calibrate calibrate.pro CONFIG_CAMERA noncore/multimedia/camera camera.pro CONFIG_CARDMON core/applets/cardmon cardmon.pro CONFIG_CHECKBOOK noncore/apps/checkbook checkbook.pro CONFIG_CITYTIME core/settings/citytime citytime.pro CONFIG_CLIPBOARDAPPLET core/applets/clipboardapplet clipboardapplet.pro CONFIG_CLOCKAPPLET core/applets/clockapplet clockapplet.pro CONFIG_CLOCK noncore/tools/clock clock.pro CONFIG_CONFEDIT noncore/apps/confedit confedit.pro CONFIG_DASHER inputmethods/dasher dasher.pro CONFIG_DATEBOOK core/pim/datebook datebook.pro +CONFIG_DATEBOOK2 core/pim/datebook2 datebook2.pro CONFIG_DECO_FLAT noncore/decorations/flat flat.pro CONFIG_DECO_LIQUID noncore/decorations/liquid liquid.pro CONFIG_DECO_POLISHED noncore/decorations/polished polished.pro CONFIG_DICTIONARY noncore/apps/dictionary dictionary.pro CONFIG_DOCTAB noncore/settings/doctab doctab.pro CONFIG_DRAWPAD noncore/graphics/drawpad drawpad.pro CONFIG_DVORAK inputmethods/dvorak dvorak.pro CONFIG_EMBEDDEDKONSOLE core/apps/embeddedkonsole embeddedkonsole.pro CONFIG_EUROCONV noncore/tools/euroconv/ euroconv.pro CONFIG_EXAMPLE_BOARD examples/inputmethod example.pro CONFIG_EXAMPLE_MENU examples/menuapplet menuapplet.pro CONFIG_EXAMPLE_VPN examples/networksettings example.pro CONFIG_FIFTEEN noncore/games/fifteen fifteen.pro CONFIG_FILEBROWSER noncore/unsupported/filebrowser filebrowser.pro CONFIG_FLAT noncore/styles/flat flat.pro CONFIG_FORMATTER noncore/tools/formatter formatter.pro |