| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Makefile.EmbeddedMail | 6 | ||||
| -rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/xxportmanager.cpp | 2 |
4 files changed, 12 insertions, 4 deletions
@@ -3,7 +3,7 @@ DISTDIR = $(shell basename $(DISTPATH)) SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ - kabc/plugins/opie \ + kabc/plugins/opie kaddressbook/xxport/opie \ korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail all: tmake for i in $(SUBDIRS); do pushd $$i; \ @@ -46,6 +46,7 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ libical/src/libicalss/Makefile$(PLATFORM) \ kabc/Makefile$(PLATFORM) \ kabc/converter/opie/Makefile$(PLATFORM) \ + kaddressbook/xxport/opie/Makefile$(PLATFORM) \ kabc/formats/binary/Makefile$(PLATFORM) \ kabc/plugins/file/Makefile$(PLATFORM) \ kabc/plugins/dir/Makefile$(PLATFORM) \ @@ -88,6 +89,9 @@ kabc/Makefile$(PLATFORM): kabc/kabcE.pro kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) + +kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro + cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) diff --git a/Makefile.EmbeddedMail b/Makefile.EmbeddedMail index d770a05..22ba681 100644 --- a/Makefile.EmbeddedMail +++ b/Makefile.EmbeddedMail @@ -3,7 +3,7 @@ DISTDIR = $(shell basename $(DISTPATH)) SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ - kabc/plugins/opie \ + kabc/plugins/opie kaddressbook/xxport/opie \ korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail all: tmake for i in $(SUBDIRS); do pushd $$i; \ @@ -46,6 +46,7 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ libical/src/libicalss/Makefile$(PLATFORM) \ kabc/Makefile$(PLATFORM) \ kabc/converter/opie/Makefile$(PLATFORM) \ + kaddressbook/xxport/opie/Makefile$(PLATFORM) \ kabc/formats/binary/Makefile$(PLATFORM) \ kabc/plugins/file/Makefile$(PLATFORM) \ kabc/plugins/dir/Makefile$(PLATFORM) \ @@ -88,6 +89,9 @@ kabc/Makefile$(PLATFORM): kabc/kabcE.pro kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) + +kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro + cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index 8ee0725..12c83af 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp @@ -71,7 +71,7 @@ class OpieXXPortFactory : public XXPortFactory extern "C" { - void *init_kaddrbk_opie_xxport() + void *init_microkaddrbk_opie_xxport() { return ( new OpieXXPortFactory() ); } diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 20cde49..248fcab 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -197,7 +197,7 @@ void XXPortManager::loadPlugins() factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport())); //now add the opie import library dynamically - KLibFactory *factory = KLibLoader::self()->factory( "kaddrbk_opie_xxport" ); + KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" ); if ( factory ) { XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); factorylist.append(xxportFactory); |