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 |
desktop compile fix
-rw-r--r-- | Makefile | 66 | ||||
-rw-r--r-- | kdepim-desktop.pro | 3 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmanager.pro | 2 |
3 files changed, 66 insertions, 5 deletions
@@ -2,3 +2,3 @@ | |||
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 |
@@ -26,3 +26,8 @@ SUBTARGETS = \ | |||
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 | ||
@@ -98,2 +103,32 @@ sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE | |||
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 |
@@ -104,3 +139,3 @@ qmake: qmake_all | |||
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 |
@@ -116,2 +151,7 @@ qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MA | |||
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 |
@@ -128,2 +168,7 @@ clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE | |||
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 |
@@ -140,2 +185,7 @@ uninstall_subdirs: qmake_all FORCE | |||
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 |
@@ -152,2 +202,7 @@ install_subdirs: qmake_all FORCE | |||
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 |
@@ -164,2 +219,7 @@ distclean: qmake_all FORCE | |||
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 | ||
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro index 0d3877b..074d943 100644 --- a/kdepim-desktop.pro +++ b/kdepim-desktop.pro | |||
@@ -3,4 +3,3 @@ | |||
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 |
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 | |||
@@ -68,2 +68,3 @@ compiler.h \ | |||
68 | compressgzip.h \ | 68 | compressgzip.h \ |
69 | csv.h \ | ||
69 | findwnd_emb.h \ | 70 | findwnd_emb.h \ |
@@ -133,2 +134,3 @@ commentbox.cpp \ | |||
133 | compressgzip.cpp \ | 134 | compressgzip.cpp \ |
135 | csv.cpp \ | ||
134 | findwnd_emb.cpp \ | 136 | findwnd_emb.cpp \ |