-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
@@ -4,5 +4,5 @@ DISTDIR = $(shell basename $(DISTPATH)) | |||
4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ | 4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ |
5 | libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ | 5 | libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ |
6 | kabc/plugins/opie \ | 6 | kabc/plugins/opie kaddressbook/xxport/opie \ |
7 | korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail | 7 | korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail |
8 | all: tmake | 8 | all: tmake |
@@ -47,4 +47,5 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ | |||
47 | kabc/Makefile$(PLATFORM) \ | 47 | kabc/Makefile$(PLATFORM) \ |
48 | kabc/converter/opie/Makefile$(PLATFORM) \ | 48 | kabc/converter/opie/Makefile$(PLATFORM) \ |
49 | kaddressbook/xxport/opie/Makefile$(PLATFORM) \ | ||
49 | kabc/formats/binary/Makefile$(PLATFORM) \ | 50 | kabc/formats/binary/Makefile$(PLATFORM) \ |
50 | kabc/plugins/file/Makefile$(PLATFORM) \ | 51 | kabc/plugins/file/Makefile$(PLATFORM) \ |
@@ -89,4 +90,7 @@ kabc/Makefile$(PLATFORM): kabc/kabcE.pro | |||
89 | kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro | 90 | kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro |
90 | cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) | 91 | cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) |
92 | |||
93 | kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro | ||
94 | cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) | ||
91 | 95 | ||
92 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro | 96 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro |
diff --git a/Makefile.EmbeddedMail b/Makefile.EmbeddedMail index d770a05..22ba681 100644 --- a/Makefile.EmbeddedMail +++ b/Makefile.EmbeddedMail | |||
@@ -4,5 +4,5 @@ DISTDIR = $(shell basename $(DISTPATH)) | |||
4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ | 4 | SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ |
5 | libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ | 5 | libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir \ |
6 | kabc/plugins/opie \ | 6 | kabc/plugins/opie kaddressbook/xxport/opie \ |
7 | korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail | 7 | korganizer kalarmd kaddressbook kmicromail/libetpan kmicromail/libmailwrapper kmicromail |
8 | all: tmake | 8 | all: tmake |
@@ -47,4 +47,5 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \ | |||
47 | kabc/Makefile$(PLATFORM) \ | 47 | kabc/Makefile$(PLATFORM) \ |
48 | kabc/converter/opie/Makefile$(PLATFORM) \ | 48 | kabc/converter/opie/Makefile$(PLATFORM) \ |
49 | kaddressbook/xxport/opie/Makefile$(PLATFORM) \ | ||
49 | kabc/formats/binary/Makefile$(PLATFORM) \ | 50 | kabc/formats/binary/Makefile$(PLATFORM) \ |
50 | kabc/plugins/file/Makefile$(PLATFORM) \ | 51 | kabc/plugins/file/Makefile$(PLATFORM) \ |
@@ -89,4 +90,7 @@ kabc/Makefile$(PLATFORM): kabc/kabcE.pro | |||
89 | kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro | 90 | kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro |
90 | cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) | 91 | cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieconverterE.pro -o Makefile$(PLATFORM) |
92 | |||
93 | kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro | ||
94 | cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) | ||
91 | 95 | ||
92 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro | 96 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro |
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 | |||
@@ -72,5 +72,5 @@ class OpieXXPortFactory : public XXPortFactory | |||
72 | extern "C" | 72 | extern "C" |
73 | { | 73 | { |
74 | void *init_kaddrbk_opie_xxport() | 74 | void *init_microkaddrbk_opie_xxport() |
75 | { | 75 | { |
76 | return ( new OpieXXPortFactory() ); | 76 | 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 | |||
@@ -198,5 +198,5 @@ void XXPortManager::loadPlugins() | |||
198 | 198 | ||
199 | //now add the opie import library dynamically | 199 | //now add the opie import library dynamically |
200 | KLibFactory *factory = KLibLoader::self()->factory( "kaddrbk_opie_xxport" ); | 200 | KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" ); |
201 | if ( factory ) { | 201 | if ( factory ) { |
202 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); | 202 | XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory ); |