Foldername fixes

1 files changed, 28 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index de9d5ce..6856b62 100644
--- a/Makefile
+++ b/Makefile
@@ -47,2 +47,5 @@ SUBDIRS_GAMMU = \
 
+SUBDIRS_PWMANAGER = \
+   pwmanager/pwmanager
+
 SUBDIRS = \
@@ -54,3 +57,4 @@ SUBDIRS = \
    $(SUBDIRS_MICROMAIL) \
-   $(SUBDIRS_GAMMU) 
+   $(SUBDIRS_GAMMU) \
+   $(SUBDIRS_PWMANAGER) 
 
@@ -62,3 +66,4 @@ all: build_microkde \
      build_micromail \
-     build_gammu
+     build_gammu \
+     build_pwmanager
 
@@ -121,2 +126,11 @@ build_gammu: variable_test tmake
 
+build_pwmanager: build_microkde
+  ifdef BUILD_NO_PWMANAGER
+        @echo == pwmanager not build.
+  else
+        for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
 
@@ -139,2 +153,3 @@ variable_info:
         @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
+        @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
         @echo --------------------------------------
@@ -171,2 +186,5 @@ variable_test: variable_info
   endif
+  ifdef BUILD_NO_PWMANAGER
+        @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
+  endif
         @echo --------------------------------------
@@ -192,2 +210,3 @@ install:
         cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
+        cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
@@ -208,2 +227,5 @@ dist:
   endif
+  ifndef BUILD_NO_PWMANAGER
+        ./mkipks pwmanager.control
+  endif
         ./mkipks pim_TAB_icon.control
@@ -233,3 +255,3 @@ tmake: objects \
        gammu/emb/gammu/Makefile$(PLATFORM) \
-       
+       pwmanager/pwmanager/Makefile$(PLATFORM) \
 
@@ -303 +325,4 @@ gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
         cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" gammuE.pro -o Makefile$(PLATFORM)
+
+pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
+        cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" pwmanagerE.pro -o Makefile$(PLATFORM)