summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile6
-rw-r--r--Makefile.EmbeddedMail6
-rw-r--r--kaddressbook/xxport/opie/opie_xxport.cpp2
-rw-r--r--kaddressbook/xxportmanager.cpp2
4 files changed, 12 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d770a05..22ba681 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ DISTDIR = $(shell basename $(DISTPATH))
3 3
4SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ 4SUBDIRS = 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
8all: tmake 8all: tmake
9 for i in $(SUBDIRS); do pushd $$i; \ 9 for i in $(SUBDIRS); do pushd $$i; \
@@ -46,6 +46,7 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
46 libical/src/libicalss/Makefile$(PLATFORM) \ 46 libical/src/libicalss/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) \
51 kabc/plugins/dir/Makefile$(PLATFORM) \ 52 kabc/plugins/dir/Makefile$(PLATFORM) \
@@ -88,6 +89,9 @@ kabc/Makefile$(PLATFORM): kabc/kabcE.pro
88 89
89kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro 90kabc/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
93kaddressbook/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
92kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro 96kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
93 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) 97 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))
3 3
4SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \ 4SUBDIRS = 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
8all: tmake 8all: tmake
9 for i in $(SUBDIRS); do pushd $$i; \ 9 for i in $(SUBDIRS); do pushd $$i; \
@@ -46,6 +46,7 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
46 libical/src/libicalss/Makefile$(PLATFORM) \ 46 libical/src/libicalss/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) \
51 kabc/plugins/dir/Makefile$(PLATFORM) \ 52 kabc/plugins/dir/Makefile$(PLATFORM) \
@@ -88,6 +89,9 @@ kabc/Makefile$(PLATFORM): kabc/kabcE.pro
88 89
89kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieconverterE.pro 90kabc/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
93kaddressbook/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
92kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro 96kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
93 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) 97 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
71 71
72extern "C" 72extern "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() );
77 } 77 }
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()
197 factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport())); 197 factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport()));
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 );
203 factorylist.append(xxportFactory); 203 factorylist.append(xxportFactory);