changes to support sharp converter

2 files changed, 33 insertions, 7 deletions

diff --git a/Makefile.Embedded b/Makefile.Embedded
index c86600b..3ffa7b5 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -1,126 +1,151 @@
 DISTPATH = $(shell pwd)
 DISTDIR = $(shell basename $(DISTPATH))
 
-SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
-   libkcal libkdepim kabc kabc/converter/opie kabc/converter/qtopia kabc/formats/binary \
+SUBDIRS = libical/src/libical \
+   libical/src/libicalss \
+   qtcompat \
+   microkde \
+   libkcal \
+   libkdepim \
+   kabc \
+   kabc/converter/opie \
+   kabc/converter/qtopia \
+   kabc/converter/sharpdtm \
+   kabc/formats/binary \
    kabc/plugins/file \
    kabc/plugins/dir \
    kabc/plugins/ldap \
    kabc/plugins/opie \
    kabc/plugins/qtopia \
    kabc/plugins/sharpdtm \
-         korganizer kalarmd kaddressbook/xxport/opie kaddressbook/xxport/qtopia kaddressbook
+   korganizer \
+   kalarmd \
+   kaddressbook/xxport/opie \
+   kaddressbook/xxport/qtopia \
+   kaddressbook/xxport/sharpdtm \
+   kaddressbook
+
 all: tmake
         for i in $(SUBDIRS); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 objects:
         for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
         for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
         mkdir -p libical/lib/$(PLATFORM)
 
 clean:
         rm -f libical/lib/$(PLATFORM)/*;
         for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 install:
         cd bin/kdepim; make install
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
 
 dist:
         @echo Dont forget to do "make install" before "make dist"
         rm -f *arm.ipk
         rm -f *~
         cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
-        mkipks kdepim.control
-        mkipks korganizer-alarm.control
+        ./mkipks kdepim.control
+        ./mkipks korganizer-alarm.control
 
 tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/converter/opie/Makefile$(PLATFORM) \
        kabc/converter/qtopia/Makefile$(PLATFORM) \
+       kabc/converter/sharpdtm/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/xxport/opie/Makefile$(PLATFORM) \
        kaddressbook/xxport/qtopia/Makefile$(PLATFORM) \
+       kaddressbook/xxport/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM)
 
 
 
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
         cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
 
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
         cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
 
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
         cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
 
 
 libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
         cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
 
 kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
         cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
 
 korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
         cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
 
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
         cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
 
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
         cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
 
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
         cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
 
 kabc/converter/opie/Makefile$(PLATFORM): kabc/converter/opie/opieE.pro
         cd kabc/converter/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
 
 kabc/converter/qtopia/Makefile$(PLATFORM): kabc/converter/qtopia/qtopiaE.pro
         cd kabc/converter/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
-    
+   
+kabc/converter/sharpdtm/Makefile$(PLATFORM): kabc/converter/sharpdtm/sharpdtmE.pro
+        cd kabc/converter/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.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)
 
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
         cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" fileE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
         cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" dirE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
         cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" ldapE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
         cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
         cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
 
 kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
         cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.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)
 
 kaddressbook/xxport/qtopia/Makefile$(PLATFORM): kaddressbook/xxport/qtopia/qtopiaE.pro
         cd kaddressbook/xxport/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
           
+kaddressbook/xxport/sharpdtm/Makefile$(PLATFORM): kaddressbook/xxport/sharpdtm/sharpdtmE.pro
+        cd kaddressbook/xxport/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
+
+
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
         cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
 
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 0164b80..f29be2f 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,30 +1,31 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
 #release debug
 TARGET = microkabc_sharpdtm
 
 INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/qtopia ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 LIBS += -lqte
-LIBS += -lmicrokabc_opieconverter
+LIBS += -lzdtm
+LIBS += -lmicrokabc_sharpdtmconverter
 #LIBS += -L../../lib/$(PLATFORM)
 
 
 INTERFACES = \
 
 HEADERS = \
  resourcesharpdtm.h \
  resourcesharpdtmconfig.h \
  
 SOURCES = \
  resourcesharpdtm.cpp \
  resourcesharpdtmconfig.cpp \