desktop compile fix

author: zautrix <zautrix> 2004-10-23 07:41:05 (UTC)
committer: zautrix <zautrix> 2004-10-23 07:41:05 (UTC)
commit: eb0bc46bfbba45a84c7353f1c9c4dba27273f021 (patch) (unidiff)
tree: 9c0b00efa45925ee25d54ddb994754ba2e9aa420
parent: c1afd7a11c374573ad39a829567d05fb5a0453ce (diff)
download: kdepimpi-eb0bc46bfbba45a84c7353f1c9c4dba27273f021.zip
kdepimpi-eb0bc46bfbba45a84c7353f1c9c4dba27273f021.tar.gz
kdepimpi-eb0bc46bfbba45a84c7353f1c9c4dba27273f021.tar.bz2
3 files changed, 66 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index e0d07f6..2f5691a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #############################################################################
 # Makefile for building: kdepim-desktop
-# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Oct 23 08:57:10 2004
+# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Oct 23 09:29:11 2004
 # Project:  kdepim-desktop.pro
 # Template: subdirs
@@ -25,5 +25,10 @@ SUBTARGETS =	 \
                sub-kaddressbook \
                sub-kabc-plugins-file \
-                sub-kabc-plugins-dir
+                sub-kabc-plugins-dir \
+                sub-pwmanager-libcrypt-cipher \
+                sub-pwmanager-libcrypt-error \
+                sub-pwmanager-libcrypt-mpi \
+                sub-pwmanager-libcrypt-zlib \
+                sub-pwmanager-pwmanager
 first: all
@@ -97,4 +102,34 @@ sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
        cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
+pwmanager/libcrypt/cipher/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher"
+        cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
+        cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
+pwmanager/libcrypt/error/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error"
+        cd pwmanager/libcrypt/error && $(QMAKE) error.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
+        cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
+pwmanager/libcrypt/mpi/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi"
+        cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
+        cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
+pwmanager/libcrypt/zlib/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib"
+        cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
+        cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
+pwmanager/pwmanager/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager"
+        cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
+        cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
 Makefile: kdepim-desktop.pro  /usr/local/qtgcc/mkspecs/default/qmake.conf 
        $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
@@ -103,5 +138,5 @@ qmake: qmake_all
 all: $(SUBTARGETS)
-qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
+qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE)
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
@@ -115,4 +150,9 @@ qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MA
         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
 clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
@@ -127,4 +167,9 @@ clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true
 uninstall_subdirs: qmake_all FORCE
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
@@ -139,4 +184,9 @@ uninstall_subdirs: qmake_all FORCE
         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
 install_subdirs: qmake_all FORCE
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
@@ -151,4 +201,9 @@ install_subdirs: qmake_all FORCE
         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true
+         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true
+         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true
 distclean: qmake_all FORCE
         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
@@ -163,4 +218,9 @@ distclean: qmake_all FORCE
         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
 install:  install_subdirs
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index 0d3877b..074d943 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -2,6 +2,5 @@
 TEMPLATE = subdirs
-SUBDIRS =    gammu/emb/common gammu/emb/gammu libical libkcal microkde libkdepim kabc korganizer kaddressbook kabc/plugins/file kabc/plugins/dir 
+SUBDIRS =    gammu/emb/common gammu/emb/gammu libical libkcal microkde libkdepim kabc korganizer kaddressbook kabc/plugins/file kabc/plugins/dir pwmanager/libcrypt/cipher  pwmanager/libcrypt/error  pwmanager/libcrypt/mpi  pwmanager/libcrypt/zlib pwmanager/pwmanager
-#pwmanager/libcrypt/cipher  pwmanager/libcrypt/error  pwmanager/libcrypt/mpi  pwmanager/libcrypt/zlib pwmanager/pwmanager
 #kalarmd
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
index 49c1f46..80b2519 100644
--- a/pwmanager/pwmanager/pwmanager.pro
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -67,4 +67,5 @@ commentbox.h \
 compiler.h \
 compressgzip.h \
+csv.h \
 findwnd_emb.h \
 findwndimpl.h \
@@ -132,4 +133,5 @@ blowfish.cpp \
 commentbox.cpp \
 compressgzip.cpp \
+csv.cpp \
 findwnd_emb.cpp \
 findwndimpl.cpp \
author	zautrix <zautrix>	2004-10-23 07:41:05 (UTC)
committer	zautrix <zautrix>	2004-10-23 07:41:05 (UTC)
commit	eb0bc46bfbba45a84c7353f1c9c4dba27273f021 (patch) (unidiff)
tree	9c0b00efa45925ee25d54ddb994754ba2e9aa420
parent	c1afd7a11c374573ad39a829567d05fb5a0453ce (diff)
download	kdepimpi-eb0bc46bfbba45a84c7353f1c9c4dba27273f021.zip kdepimpi-eb0bc46bfbba45a84c7353f1c9c4dba27273f021.tar.gz kdepimpi-eb0bc46bfbba45a84c7353f1c9c4dba27273f021.tar.bz2

diff --git a/Makefile b/Makefile index e0d07f6..2f5691a 100644 --- a/Makefile +++ b/Makefile
@@ -1,5 +1,5 @@
1	#############################################################################	1	#############################################################################
2	# Makefile for building: kdepim-desktop	2	# Makefile for building: kdepim-desktop
3	# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Oct 23 08:57:10 2004	3	# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Oct 23 09:29:11 2004
4	# Project: kdepim-desktop.pro	4	# Project: kdepim-desktop.pro
5	# Template: subdirs	5	# Template: subdirs
@@ -25,5 +25,10 @@ SUBTARGETS = \
25	sub-kaddressbook \	25	sub-kaddressbook \
26	sub-kabc-plugins-file \	26	sub-kabc-plugins-file \
27	sub-kabc-plugins-dir	27	sub-kabc-plugins-dir \
		28	sub-pwmanager-libcrypt-cipher \
		29	sub-pwmanager-libcrypt-error \
		30	sub-pwmanager-libcrypt-mpi \
		31	sub-pwmanager-libcrypt-zlib \
		32	sub-pwmanager-pwmanager
28		33
29	first: all	34	first: all
@@ -97,4 +102,34 @@ sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
97	cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)	102	cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
98		103
		104	pwmanager/libcrypt/cipher/$(MAKEFILE):
		105	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" \|\| $(MKDIR) "pwmanager/libcrypt/cipher"
		106	cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
		107	sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
		108	cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
		109
		110	pwmanager/libcrypt/error/$(MAKEFILE):
		111	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" \|\| $(MKDIR) "pwmanager/libcrypt/error"
		112	cd pwmanager/libcrypt/error && $(QMAKE) error.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
		113	sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
		114	cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
		115
		116	pwmanager/libcrypt/mpi/$(MAKEFILE):
		117	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" \|\| $(MKDIR) "pwmanager/libcrypt/mpi"
		118	cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
		119	sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
		120	cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
		121
		122	pwmanager/libcrypt/zlib/$(MAKEFILE):
		123	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" \|\| $(MKDIR) "pwmanager/libcrypt/zlib"
		124	cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
		125	sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
		126	cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
		127
		128	pwmanager/pwmanager/$(MAKEFILE):
		129	@$(CHK_DIR_EXISTS) "pwmanager/pwmanager" \|\| $(MKDIR) "pwmanager/pwmanager"
		130	cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
		131	sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
		132	cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
		133
99	Makefile: kdepim-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf	134	Makefile: kdepim-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf
100	$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro	135	$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
@@ -103,5 +138,5 @@ qmake: qmake_all
103		138
104	all: $(SUBTARGETS)	139	all: $(SUBTARGETS)
105	qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)	140	qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE)
106	( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	141	( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
107	( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	142	( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
@@ -115,4 +150,9 @@ qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MA
115	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	150	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
116	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true	151	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
		152	( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
		153	( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
		154	( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
		155	( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
		156	( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) \|\| true
117	clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE	157	clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
118	( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	158	( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true
@@ -127,4 +167,9 @@ clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
127	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	167	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true
128	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true	168	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true
		169	( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true
		170	( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true
		171	( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true
		172	( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true
		173	( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) \|\| true
129	uninstall_subdirs: qmake_all FORCE	174	uninstall_subdirs: qmake_all FORCE
130	( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	175	( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
@@ -139,4 +184,9 @@ uninstall_subdirs: qmake_all FORCE
139	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	184	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
140	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true	185	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
		186	( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
		187	( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
		188	( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
		189	( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
		190	( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) \|\| true
141	install_subdirs: qmake_all FORCE	191	install_subdirs: qmake_all FORCE
142	( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true	192	( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
@@ -151,4 +201,9 @@ install_subdirs: qmake_all FORCE
151	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true	201	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
152	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true	202	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
		203	( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
		204	( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
		205	( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
		206	( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
		207	( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) \|\| true
153	distclean: qmake_all FORCE	208	distclean: qmake_all FORCE
154	( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true	209	( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
@@ -163,4 +218,9 @@ distclean: qmake_all FORCE
163	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true	218	( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
164	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true	219	( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
		220	( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
		221	( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
		222	( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
		223	( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
		224	( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) \|\| true
165		225
166	install: install_subdirs	226	install: install_subdirs


diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro index 0d3877b..074d943 100644 --- a/kdepim-desktop.pro +++ b/kdepim-desktop.pro
@@ -2,6 +2,5 @@
2		2
3	TEMPLATE = subdirs	3	TEMPLATE = subdirs
4	SUBDIRS = gammu/emb/common gammu/emb/gammu libical libkcal microkde libkdepim kabc korganizer kaddressbook kabc/plugins/file kabc/plugins/dir	4	SUBDIRS = gammu/emb/common gammu/emb/gammu libical libkcal microkde libkdepim kabc korganizer kaddressbook kabc/plugins/file kabc/plugins/dir pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
5	#pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager
6	#kalarmd	5	#kalarmd
7		6


diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro index 49c1f46..80b2519 100644 --- a/pwmanager/pwmanager/pwmanager.pro +++ b/pwmanager/pwmanager/pwmanager.pro
@@ -67,4 +67,5 @@ commentbox.h \
67	compiler.h \	67	compiler.h \
68	compressgzip.h \	68	compressgzip.h \
		69	csv.h \
69	findwnd_emb.h \	70	findwnd_emb.h \
70	findwndimpl.h \	71	findwndimpl.h \
@@ -132,4 +133,5 @@ blowfish.cpp \
132	commentbox.cpp \	133	commentbox.cpp \
133	compressgzip.cpp \	134	compressgzip.cpp \
		135	csv.cpp \
134	findwnd_emb.cpp \	136	findwnd_emb.cpp \
135	findwndimpl.cpp \	137	findwndimpl.cpp \