implemented new include strategy for makefiles

1 files changed, 7 insertions, 3 deletions

diff --git a/Makefile.Embedded b/Makefile.Embedded
index 38fd000..9b55ecf 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -1,8 +1,7 @@
-DISTPATH = $(shell pwd)
-DISTDIR = $(shell basename $(DISTPATH))
+export KDEPIMDIR = $(shell pwd)
 
 
 ifeq ($(PLATFORM) , zaurus)
   BUILD_NO_LDAP_PLUGIN=1
 endif
 
@@ -107,12 +106,13 @@ build_micromail: build_microkde
   endif
 
 
 variable_info:
         @echo --------------------------------------
         @echo KDEPIM buildsystem, variableinfo...
+        @echo KDEPIMDIR=$(KDEPIMDIR)
         @echo QTDIR=$(QTDIR)
         @echo QPEDIR=$(QPEDIR)
         @echo OPIEDIR=$(OPIEDIR)
         @echo PLATFORM=$(PLATFORM)
         @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
         @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
@@ -123,12 +123,16 @@ variable_info:
         @echo SHARPDTMSDK=$(SHARPDTMSDK)
         endif
         @echo --------------------------------------
 
 variable_test: variable_info
         @echo KDEPIM buildsystem, variablecheck...
+  ifndef KDEPIMDIR
+        @echo KDEPIMDIR is not defined.
+        $(error KDEPIMDIR is not defined)
+  endif
   ifndef PLATFORM
         @echo PLATFORM is not defined.
         $(error PLATFORM is not defined)
   endif
   ifdef BUILD_NO_LDAP_PLUGIN
         @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
@@ -153,13 +157,13 @@ variable_test: variable_info
 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)/*;
+        rm -rf 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