added env variable SHARPDTMSDK

4 files changed, 40 insertions, 24 deletions

diff --git a/Makefile.Embedded b/Makefile.Embedded
index 71035d6..7777a19 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -3,2 +3,3 @@ DISTDIR = $(shell basename $(DISTPATH))
 
+
 ifeq ($(PLATFORM) , zaurus)
@@ -11,4 +12,3 @@ endif
 
-
-SUBDIRS_MAIN = \
+SUBDIRS_MICROKDE = \
    libical/src/libical \
@@ -50,3 +50,12 @@ SUBDIRS_MICROMAIL = \
 
-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 \
@@ -58,4 +67,4 @@ 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; \
@@ -63,3 +72,3 @@ build_main: variable_info tmake
 
-build_qtopia_plugin: build_main
+build_qtopia_plugin: build_microkde
 	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
@@ -68,3 +77,3 @@ build_qtopia_plugin: build_main
 
-build_opie_plugin: build_main
+build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
@@ -77,3 +86,3 @@ build_opie_plugin: build_main
   
-build_sharp_plugin: build_main
+build_sharp_plugin: build_microkde
   ifdef BUILD_NO_SHARP_PLUGIN
@@ -86,3 +95,3 @@ build_sharp_plugin: build_main
   
-build_ldap_plugin: build_main
+build_ldap_plugin: build_microkde
   ifdef BUILD_NO_LDAP_PLUGIN
@@ -96,3 +105,3 @@ build_ldap_plugin: build_main
 
-build_micromail: build_main
+build_micromail: build_microkde
   ifdef BUILD_NO_MICROMAIL
@@ -106,5 +115,5 @@ build_micromail: build_main
 
-variable_info: variable_test 
+variable_info:
 	@echo --------------------------------------
-	@echo KDEPIM buildsystem, variablecheck...
+	@echo KDEPIM buildsystem, variableinfo...
 	@echo QTDIR=$(QTDIR)
@@ -114,2 +123,3 @@ variable_info: variable_test
 	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
+	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
 	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
@@ -117,6 +127,9 @@ variable_info: variable_test
 	@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
@@ -127,5 +140,2 @@ variable_test:
   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
@@ -133,3 +143,11 @@ variable_test:
   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 --------------------------------------
 
diff --git a/kabc/converter/sharpdtm/sharpdtmE.pro b/kabc/converter/sharpdtm/sharpdtmE.pro
index cd7032a..89b4e64 100644
--- a/kabc/converter/sharpdtm/sharpdtmE.pro
+++ b/kabc/converter/sharpdtm/sharpdtmE.pro
@@ -1,3 +1,3 @@
 TEMPLATE = lib
-INCLUDEPATH += . ../.. ../../../external/sharpdtm/include ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include
+INCLUDEPATH += . ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include
 #CONFIG += staticlib 
@@ -15,3 +15,3 @@ LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
-LIBS += -lqpepim
+#LIBS += -lqpepim
 LIBS += -lqpe
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 7c7a6d5..a03454f 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -2,6 +2,5 @@ TEMPLATE	= lib
 CONFIG += qt warn_on
-#release debug
 TARGET = microkabc_sharpdtm
 
-INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 
+INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 
 
@@ -18,3 +17,2 @@ LIBS += -lzdtm
 LIBS += -lmicrokabc_sharpdtmconverter
-#LIBS += -L../../lib/$(PLATFORM)
 
diff --git a/kaddressbook/xxport/sharpdtm/sharpdtmE.pro b/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
index 0425c42..de8e342 100644
--- a/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
+++ b/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
@@ -10,3 +10,3 @@ DEFINES += KAB_EMBEDDED
 
-INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../..  ../../../kabc ../../../kabc/converter/sharpdtm ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../..  ../../../kabc ../../../kabc/converter/sharpdtm ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
 LIBS += -L$(QPEDIR)/lib