1 files changed, 36 insertions, 18 deletions

diff --git a/Makefile.Embedded b/Makefile.Embedded
index 71035d6..7777a19 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -2,4 +2,5 @@ DISTPATH = $(shell pwd)
 DISTDIR = $(shell basename $(DISTPATH))
 
+
 ifeq ($(PLATFORM) , zaurus)
   BUILD_NO_LDAP_PLUGIN=1
@@ -10,6 +11,5 @@ ifneq ($(PLATFORM) , zaurus)
 endif
 
-
-SUBDIRS_MAIN = \
+SUBDIRS_MICROKDE = \
    libical/src/libical \
    libical/src/libicalss \
@@ -49,5 +49,14 @@ SUBDIRS_MICROMAIL = \
    kmicromail
 
-all: build_main \
+SUBDIRS = \
+   $(SUBDIRS_MICROKDE) \
+   $(SUBDIRS_QTOPIA_PLUGIN) \
+   $(SUBDIRS_OPIE_PLUGIN) \
+   $(SUBDIRS_SHARP_PLUGIN) \
+   $(SUBDIRS_LDAP_PLUGIN) \
+   $(SUBDIRS_MICROMAIL)
+
+
+all: build_microkde \
      build_qtopia_plugin \
      build_opie_plugin \
@@ -57,15 +66,15 @@ all: build_main \
 
 
-build_main: variable_info tmake
-        for i in $(SUBDIRS_MAIN); do pushd $$i; \
+build_microkde: variable_test tmake
+        for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
-build_qtopia_plugin: build_main
+build_qtopia_plugin: build_microkde
         for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
-build_opie_plugin: build_main
+build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
         @echo ---> opie plugin not build.
@@ -76,5 +85,5 @@ build_opie_plugin: build_main
   endif
   
-build_sharp_plugin: build_main
+build_sharp_plugin: build_microkde
   ifdef BUILD_NO_SHARP_PLUGIN
         @echo ---> ldap plugin not build.
@@ -85,5 +94,5 @@ build_sharp_plugin: build_main
   endif
   
-build_ldap_plugin: build_main
+build_ldap_plugin: build_microkde
   ifdef BUILD_NO_LDAP_PLUGIN
         @echo ---> ldap plugin not build.
@@ -95,5 +104,5 @@ build_ldap_plugin: build_main
 
 
-build_micromail: build_main
+build_micromail: build_microkde
   ifdef BUILD_NO_MICROMAIL
         @echo ---> micromail not build.
@@ -105,7 +114,7 @@ build_micromail: build_main
 
 
-variable_info: variable_test 
+variable_info:
         @echo --------------------------------------
-        @echo KDEPIM buildsystem, variablecheck...
+        @echo KDEPIM buildsystem, variableinfo...
         @echo QTDIR=$(QTDIR)
         @echo QPEDIR=$(QPEDIR)
@@ -113,11 +122,15 @@ variable_info: variable_test
         @echo PLATFORM=$(PLATFORM)
         @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
+        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
         @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)
+        ifndef BUILD_NO_SHARP_PLUGIN
+        @echo SHARPDTMSDK=$(SHARPDTMSDK)
+        endif
         @echo --------------------------------------
 
-variable_test: 
+variable_test: variable_info
+        @echo KDEPIM buildsystem, variablecheck...
   ifdef BUILD_NO_LDAP_PLUGIN
         @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
@@ -126,11 +139,16 @@ variable_test:
         @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
-
+  ifdef BUILD_NO_SHARP_PLUGIN
+        @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
+  else
+          ifndef SHARPDTMSDK
+        @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
+        $(error SHARPDTMSDK is not defined)
+          endif
+  endif
+        @echo --------------------------------------