1 files changed, 139 insertions, 17 deletions

diff --git a/Makefile.Embedded b/Makefile.Embedded
index 3ffa7b5..39d852f 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -1,88 +1,202 @@
 DISTPATH = $(shell pwd)
 DISTDIR = $(shell basename $(DISTPATH))
 
-SUBDIRS = libical/src/libical \
+ifeq ($(PLATFORM) , zaurus)
+  BUILD_NO_LDAP_PLUGIN=1
+endif
+
+
+SUBDIRS_MAIN = \
+   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/xxport/sharpdtm \
    kaddressbook
 
-all: tmake
-        for i in $(SUBDIRS); do pushd $$i; \
+SUBDIRS_QTOPIA_PLUGIN = \
+   kabc/converter/qtopia \
+   kabc/plugins/qtopia \
+   kaddressbook/xxport/qtopia
+
+SUBDIRS_OPIE_PLUGIN = \
+   kabc/converter/opie \
+   kabc/plugins/opie \
+   kaddressbook/xxport/opie
+
+SUBDIRS_SHARP_PLUGIN = \
+   kabc/converter/sharpdtm \
+   kabc/plugins/sharpdtm \
+   kaddressbook/xxport/sharpdtm
+
+SUBDIRS_LDAP_PLUGIN = \
+   kabc/plugins/ldap
+
+SUBDIRS_MICROMAIL = \
+   kmicromail/libetpan \
+   kmicromail/libmailwrapper \
+   kmicromail
+
+all: build_main \
+     build_qtopia_plugin \
+     build_opie_plugin \
+     build_sharp_plugin \
+     build_ldap_plugin \
+     build_micromail
+
+
+build_main: variable_info tmake
+        for i in $(SUBDIRS_MAIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+
+build_qtopia_plugin: build_main
+        for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
+build_opie_plugin: build_main
+  ifdef BUILD_NO_OPIE_PLUGIN
+        @echo ---> opie plugin not build.
+  else
+        for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+  
+build_sharp_plugin: build_main
+  ifdef BUILD_NO_SHARP_PLUGIN
+        @echo ---> ldap plugin not build.
+  else
+        for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+  
+build_ldap_plugin: build_main
+  ifdef BUILD_NO_LDAP_PLUGIN
+        @echo ---> ldap plugin not build.
+  else
+          for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
+            make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+
+build_micromail: build_main
+  ifdef BUILD_NO_MICROMAIL
+        @echo ---> micromail not build.
+  else
+        for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+
+variable_info: variable_test 
+        @echo --------------------------------------
+        @echo KDEPIM buildsystem, variablecheck...
+        @echo QTDIR=$(QTDIR)
+        @echo QPEDIR=$(QPEDIR)
+        @echo OPIEDIR=$(OPIEDIR)
+        @echo PLATFORM=$(PLATFORM)
+        @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
+        @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
+        @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+        @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
+        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
+        @echo --------------------------------------
+
+variable_test: 
+  ifdef BUILD_NO_LDAP_PLUGIN
+        @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
+  endif
+  ifdef BUILD_NO_OPIE_PLUGIN
+        @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
+  endif
+  ifdef BUILD_NO_SHARP_PLUGIN
+        @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
+  endif
+  ifdef BUILD_NO_MICROMAIL
+        @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
+  endif
+
+
+
 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 db2file/db2file $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
+        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.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 kmicrokdelibs.control
+        ./mkipks korganizer.control
+        ./mkipks kaddressbook.control
+  ifndef BUILD_NO_MICROMAIL
+        ./mkipks kopiemail.control
+  endif
         ./mkipks korganizer-alarm.control
 
-tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
+tmake: objects \
+       qtcompat/Makefile$(PLATFORM) \
+       microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
-       libkdepim/Makefile$(PLATFORM) korganizer/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)
+       kaddressbook/Makefile$(PLATFORM) \
+       kmicromail/Makefile$(PLATFORM) \
+       kmicromail/libetpan/Makefile$(PLATFORM) \
+       kmicromail/libmailwrapper/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)
 
@@ -140,12 +254,20 @@ 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)
 
+kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
+        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
+
+kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
+        cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
+
+kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
+        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)