| -rw-r--r-- | Makefile | 589 | ||||
| -rw-r--r-- | kdepim-desktop.pro | 2 | ||||
| -rw-r--r-- | pwmanager/pwmanager/main.cpp | 1 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 12 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwm.h | 8 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwmanager.pro | 33 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwmdoc.cpp | 8 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwminit.cpp | 16 | ||||
| -rw-r--r-- | pwmanager/pwmanager/serializer.cpp | 6 |
9 files changed, 281 insertions, 394 deletions
| @@ -1,362 +1,229 @@ | |||
| 1 | export KDEPIMDIR = $(shell pwd) | 1 | ############################################################################# |
| 2 | 2 | # Makefile for building: kdepim-desktop | |
| 3 | export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version) | 3 | # Generated by qmake (1.07a) (Qt 3.3.1) on: Wed Oct 20 01:01:01 2004 |
| 4 | 4 | # Project: kdepim-desktop.pro | |
| 5 | ifeq ($(PLATFORM) , zaurus) | 5 | # Template: subdirs |
| 6 | BUILD_NO_LDAP_PLUGIN=1 | 6 | # Command: $(QMAKE) -o Makefile kdepim-desktop.pro |
| 7 | endif | 7 | ############################################################################# |
| 8 | 8 | ||
| 9 | ifneq ($(PLATFORM) , zaurus) | 9 | MAKEFILE =Makefile |
| 10 | BUILD_NO_SHARP_PLUGIN=1 | 10 | QMAKE =qmake |
| 11 | endif | 11 | DEL_FILE = rm -f |
| 12 | 12 | CHK_DIR_EXISTS= test -d | |
| 13 | SUBDIRS_MICROKDE = \ | 13 | MKDIR = mkdir -p |
| 14 | libical/src/libical \ | 14 | SUBTARGETS = \ |
| 15 | libical/src/libicalss \ | 15 | sub-pwmanager-libcrypt-cipher \ |
| 16 | qtcompat \ | 16 | sub-pwmanager-libcrypt-error \ |
| 17 | microkde \ | 17 | sub-pwmanager-libcrypt-mpi \ |
| 18 | libkcal \ | 18 | sub-pwmanager-libcrypt-zlib \ |
| 19 | libkdepim \ | 19 | sub-gammu-emb-common \ |
| 20 | kabc \ | 20 | sub-gammu-emb-gammu \ |
| 21 | kabc/formats/binary \ | 21 | sub-libical \ |
| 22 | kabc/plugins/file \ | 22 | sub-libkcal \ |
| 23 | kabc/plugins/dir \ | 23 | sub-microkde \ |
| 24 | korganizer \ | 24 | sub-libkdepim \ |
| 25 | kalarmd \ | 25 | sub-kabc \ |
| 26 | kaddressbook | 26 | sub-pwmanager-pwmanager \ |
| 27 | 27 | sub-korganizer \ | |
| 28 | SUBDIRS_QTOPIA_PLUGIN = \ | 28 | sub-kaddressbook \ |
| 29 | kabc/plugins/qtopia | 29 | sub-kabc-plugins-file \ |
| 30 | 30 | sub-kabc-plugins-dir | |
| 31 | SUBDIRS_OPIE_PLUGIN = \ | 31 | |
| 32 | kabc/plugins/opie | 32 | first: all |
| 33 | 33 | ||
| 34 | SUBDIRS_SHARP_PLUGIN = \ | 34 | all: Makefile $(SUBTARGETS) |
| 35 | kabc/plugins/sharpdtm | 35 | |
| 36 | 36 | pwmanager/libcrypt/cipher/$(MAKEFILE): | |
| 37 | SUBDIRS_LDAP_PLUGIN = \ | 37 | @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher" |
| 38 | kabc/plugins/ldap | 38 | cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE) |
| 39 | 39 | sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE | |
| 40 | SUBDIRS_MICROMAIL = \ | 40 | cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE) |
| 41 | kmicromail/libetpan \ | 41 | |
| 42 | kmicromail/libmailwrapper \ | 42 | pwmanager/libcrypt/error/$(MAKEFILE): |
| 43 | kmicromail | 43 | @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error" |
| 44 | 44 | cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE) | |
| 45 | SUBDIRS_GAMMU = \ | 45 | sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE |
| 46 | gammu/emb/common \ | 46 | cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE) |
| 47 | gammu/emb/gammu | 47 | |
| 48 | 48 | pwmanager/libcrypt/mpi/$(MAKEFILE): | |
| 49 | SUBDIRS_PWMANAGER = \ | 49 | @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi" |
| 50 | pwmanager/libcrypt/mpi \ | 50 | cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE) |
| 51 | pwmanager/libcrypt/error \ | 51 | sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE |
| 52 | pwmanager/libcrypt/cipher \ | 52 | cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE) |
| 53 | pwmanager/libcrypt/zlib \ | 53 | |
| 54 | pwmanager/pwmanager | 54 | pwmanager/libcrypt/zlib/$(MAKEFILE): |
| 55 | 55 | @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib" | |
| 56 | SUBDIRS = \ | 56 | cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE) |
| 57 | $(SUBDIRS_MICROKDE) \ | 57 | sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE |
| 58 | $(SUBDIRS_QTOPIA_PLUGIN) \ | 58 | cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE) |
| 59 | $(SUBDIRS_OPIE_PLUGIN) \ | 59 | |
| 60 | $(SUBDIRS_SHARP_PLUGIN) \ | 60 | gammu/emb/common/$(MAKEFILE): |
| 61 | $(SUBDIRS_LDAP_PLUGIN) \ | 61 | @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" |
| 62 | $(SUBDIRS_MICROMAIL) \ | 62 | cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE) |
| 63 | $(SUBDIRS_GAMMU) \ | 63 | sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE |
| 64 | $(SUBDIRS_PWMANAGER) | 64 | cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) |
| 65 | 65 | ||
| 66 | 66 | gammu/emb/gammu/$(MAKEFILE): | |
| 67 | all: build_microkde \ | 67 | @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu" |
| 68 | build_qtopia_plugin \ | 68 | cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE) |
| 69 | build_opie_plugin \ | 69 | sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE |
| 70 | build_sharp_plugin \ | 70 | cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE) |
| 71 | build_ldap_plugin \ | 71 | |
| 72 | build_micromail \ | 72 | libical/$(MAKEFILE): |
| 73 | build_gammu \ | 73 | @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" |
| 74 | build_pwmanager | 74 | cd libical && $(QMAKE) libical.pro -o $(MAKEFILE) |
| 75 | 75 | sub-libical: libical/$(MAKEFILE) FORCE | |
| 76 | 76 | cd libical && $(MAKE) -f $(MAKEFILE) | |
| 77 | build_microkde: variable_test tmake | 77 | |
| 78 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ | 78 | libkcal/$(MAKEFILE): |
| 79 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 79 | @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" |
| 80 | done | 80 | cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE) |
| 81 | 81 | sub-libkcal: libkcal/$(MAKEFILE) FORCE | |
| 82 | build_qtopia_plugin: build_microkde | 82 | cd libkcal && $(MAKE) -f $(MAKEFILE) |
| 83 | ifdef BUILD_NO_QTOPIA_PLUGIN | 83 | |
| 84 | @echo == qtopia plugin not build. | 84 | microkde/$(MAKEFILE): |
| 85 | else | 85 | @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" |
| 86 | for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ | 86 | cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE) |
| 87 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 87 | sub-microkde: microkde/$(MAKEFILE) FORCE |
| 88 | done | 88 | cd microkde && $(MAKE) -f $(MAKEFILE) |
| 89 | endif | 89 | |
| 90 | 90 | libkdepim/$(MAKEFILE): | |
| 91 | build_opie_plugin: build_microkde | 91 | @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" |
| 92 | ifdef BUILD_NO_OPIE_PLUGIN | 92 | cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE) |
| 93 | @echo == opie plugin not build. | 93 | sub-libkdepim: libkdepim/$(MAKEFILE) FORCE |
| 94 | else | 94 | cd libkdepim && $(MAKE) -f $(MAKEFILE) |
| 95 | for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ | 95 | |
| 96 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 96 | kabc/$(MAKEFILE): |
| 97 | done | 97 | @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" |
| 98 | endif | 98 | cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE) |
| 99 | 99 | sub-kabc: kabc/$(MAKEFILE) FORCE | |
| 100 | build_sharp_plugin: build_microkde | 100 | cd kabc && $(MAKE) -f $(MAKEFILE) |
| 101 | ifdef BUILD_NO_SHARP_PLUGIN | 101 | |
| 102 | @echo == ldap plugin not build. | 102 | pwmanager/pwmanager/$(MAKEFILE): |
| 103 | else | 103 | @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager" |
| 104 | for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ | 104 | cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE) |
| 105 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 105 | sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE |
| 106 | done | 106 | cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE) |
| 107 | endif | 107 | |
| 108 | 108 | korganizer/$(MAKEFILE): | |
| 109 | build_ldap_plugin: build_microkde | 109 | @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer" |
| 110 | ifdef BUILD_NO_LDAP_PLUGIN | 110 | cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE) |
| 111 | @echo == ldap plugin not build. | 111 | sub-korganizer: korganizer/$(MAKEFILE) FORCE |
| 112 | else | 112 | cd korganizer && $(MAKE) -f $(MAKEFILE) |
| 113 | for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ | 113 | |
| 114 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 114 | kaddressbook/$(MAKEFILE): |
| 115 | done | 115 | @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook" |
| 116 | endif | 116 | cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE) |
| 117 | 117 | sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE | |
| 118 | 118 | cd kaddressbook && $(MAKE) -f $(MAKEFILE) | |
| 119 | build_micromail: build_microkde | 119 | |
| 120 | ifdef BUILD_NO_MICROMAIL | 120 | kabc/plugins/file/$(MAKEFILE): |
| 121 | @echo == kmicromail not build. | 121 | @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" |
| 122 | else | 122 | cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) |
| 123 | for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ | 123 | sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE |
| 124 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 124 | cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE) |
| 125 | done | 125 | |
| 126 | endif | 126 | kabc/plugins/dir/$(MAKEFILE): |
| 127 | 127 | @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir" | |
| 128 | build_gammu: variable_test tmake | 128 | cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) |
| 129 | ifdef BUILD_NO_GAMMU | 129 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE |
| 130 | @echo == gammu not build. | 130 | cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) |
| 131 | else | 131 | |
| 132 | for i in $(SUBDIRS_GAMMU); do pushd $$i; \ | 132 | Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf |
| 133 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 133 | $(QMAKE) -o Makefile kdepim-desktop.pro |
| 134 | done | 134 | qmake: qmake_all |
| 135 | endif | 135 | @$(QMAKE) -o Makefile kdepim-desktop.pro |
| 136 | 136 | ||
| 137 | build_pwmanager: build_microkde | 137 | all: $(SUBTARGETS) |
| 138 | ifdef BUILD_NO_PWMANAGER | 138 | qmake_all: pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) |
| 139 | @echo == pwmanager not build. | 139 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 140 | else | 140 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 141 | for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ | 141 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 142 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 142 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 143 | done | 143 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 144 | endif | 144 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 145 | 145 | ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | |
| 146 | 146 | ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | |
| 147 | variable_info: | 147 | ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 148 | @echo -------------------------------------- | 148 | ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 149 | @echo KDEPIM buildsystem, variableinfo... | 149 | ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 150 | @echo KDEPIMDIR=$(KDEPIMDIR) | 150 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 151 | @echo QTDIR=$(QTDIR) | 151 | ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 152 | @echo QPEDIR=$(QPEDIR) | 152 | ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 153 | @echo OPIEDIR=$(OPIEDIR) | 153 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 154 | @echo PLATFORM=$(PLATFORM) | 154 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
| 155 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) | 155 | clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE |
| 156 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) | 156 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 157 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) | 157 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 158 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) | 158 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 159 | @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) | 159 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 160 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) | 160 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 161 | ifndef BUILD_NO_SHARP_PLUGIN | 161 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 162 | @echo SHARPDTMSDK=$(SHARPDTMSDK) | 162 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 163 | endif | 163 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 164 | @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) | 164 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 165 | @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) | 165 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 166 | @echo -------------------------------------- | 166 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 167 | 167 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true | |
| 168 | variable_test: variable_info | 168 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 169 | @echo KDEPIM buildsystem, variablecheck... | 169 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 170 | ifndef KDEPIMDIR | 170 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 171 | @echo KDEPIMDIR is not defined. | 171 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
| 172 | $(error KDEPIMDIR is not defined) | 172 | uninstall_subdirs: qmake_all FORCE |
| 173 | endif | 173 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 174 | ifndef PLATFORM | 174 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 175 | @echo PLATFORM is not defined. | 175 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 176 | $(error PLATFORM is not defined) | 176 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 177 | endif | 177 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 178 | ifdef BUILD_NO_LDAP_PLUGIN | 178 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 179 | @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) | 179 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 180 | endif | 180 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 181 | ifdef BUILD_NO_OPIE_PLUGIN | 181 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 182 | @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) | 182 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 183 | endif | 183 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 184 | ifdef BUILD_NO_QTOPIA_PLUGIN | 184 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 185 | @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) | 185 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 186 | endif | 186 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 187 | ifdef BUILD_NO_MICROMAIL | 187 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 188 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) | 188 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
| 189 | endif | 189 | install_subdirs: qmake_all FORCE |
| 190 | ifdef BUILD_NO_SHARP_PLUGIN | 190 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 191 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) | 191 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 192 | else | 192 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 193 | ifndef SHARPDTMSDK | 193 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 194 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) | 194 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 195 | $(error SHARPDTMSDK is not defined) | 195 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 196 | endif | 196 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 197 | endif | 197 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 198 | ifdef BUILD_NO_GAMMU | 198 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 199 | @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) | 199 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 200 | endif | 200 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 201 | ifdef BUILD_NO_PWMANAGER | 201 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 202 | @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) | 202 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 203 | endif | 203 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 204 | @echo -------------------------------------- | 204 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true |
| 205 | 205 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true | |
| 206 | 206 | distclean: qmake_all FORCE | |
| 207 | objects: | 207 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 208 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done | 208 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 209 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done | 209 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 210 | mkdir -p libical/lib/$(PLATFORM) | 210 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 211 | mkdir -p pwmanager/libcrypt/$(PLATFORM) | 211 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 212 | 212 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true | |
| 213 | clean: | 213 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 214 | rm -rf libical/lib/$(PLATFORM)/*; | 214 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 215 | rm -rf pwmanager/libcrypt/$(PLATFORM)/*; | 215 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 216 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | 216 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 217 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | 217 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 218 | done | 218 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 219 | 219 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true | |
| 220 | install: | 220 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 221 | 221 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true | |
| 222 | cd bin/kdepim; make install | 222 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
| 223 | cp -r Pim $(QPEDIR)/apps | 223 | |
| 224 | cp db2file/db2file $(QPEDIR)/bin/db2file | 224 | install: install_subdirs |
| 225 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 225 | |
| 226 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 226 | uninstall: uninstall_subdirs |
| 227 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop | 227 | |
| 228 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop | 228 | FORCE: |
| 229 | |||
| 230 | dist: | ||
| 231 | @echo Dont forget to do "make install" before "make dist" | ||
| 232 | rm -f *arm.ipk | ||
| 233 | rm -f *~ | ||
| 234 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim | ||
| 235 | mkipks kmicrokdelibs.control | ||
| 236 | mkipks korganizer.control | ||
| 237 | mkipks kaddressbook.control | ||
| 238 | ifndef BUILD_NO_MICROMAIL | ||
| 239 | mkipks kopiemail.control | ||
| 240 | endif | ||
| 241 | mkipks korganizer-alarm.control | ||
| 242 | ifndef BUILD_NO_GAMMU | ||
| 243 | mkipks phoneaccess.control | ||
| 244 | endif | ||
| 245 | ifndef BUILD_NO_PWMANAGER | ||
| 246 | mkipks pwmanager.control | ||
| 247 | endif | ||
| 248 | mkipks pim_TAB_icon.control | ||
| 249 | |||
| 250 | tmake: objects \ | ||
| 251 | qtcompat/Makefile$(PLATFORM) \ | ||
| 252 | microkde/Makefile$(PLATFORM) \ | ||
| 253 | libkcal/Makefile$(PLATFORM) \ | ||
| 254 | libkdepim/Makefile$(PLATFORM) \ | ||
| 255 | korganizer/Makefile$(PLATFORM) \ | ||
| 256 | kalarmd/Makefile$(PLATFORM) \ | ||
| 257 | libical/src/libical/Makefile$(PLATFORM) \ | ||
| 258 | libical/src/libicalss/Makefile$(PLATFORM) \ | ||
| 259 | kabc/Makefile$(PLATFORM) \ | ||
| 260 | kabc/formats/binary/Makefile$(PLATFORM) \ | ||
| 261 | kabc/plugins/file/Makefile$(PLATFORM) \ | ||
| 262 | kabc/plugins/dir/Makefile$(PLATFORM) \ | ||
| 263 | kabc/plugins/ldap/Makefile$(PLATFORM) \ | ||
| 264 | kabc/plugins/opie/Makefile$(PLATFORM) \ | ||
| 265 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ | ||
| 266 | kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ | ||
| 267 | kaddressbook/Makefile$(PLATFORM) \ | ||
| 268 | kmicromail/Makefile$(PLATFORM) \ | ||
| 269 | kmicromail/libetpan/Makefile$(PLATFORM) \ | ||
| 270 | kmicromail/libmailwrapper/Makefile$(PLATFORM) \ | ||
| 271 | gammu/emb/common/Makefile$(PLATFORM) \ | ||
| 272 | gammu/emb/gammu/Makefile$(PLATFORM) \ | ||
| 273 | pwmanager/pwmanager/Makefile$(PLATFORM) \ | ||
| 274 | pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \ | ||
| 275 | pwmanager/libcrypt/error/Makefile$(PLATFORM) \ | ||
| 276 | pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \ | ||
| 277 | pwmanager/libcrypt/zlib/Makefile$(PLATFORM) | ||
| 278 | |||
| 279 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro | ||
| 280 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) | ||
| 281 | |||
| 282 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro | ||
| 283 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) | ||
| 284 | |||
| 285 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro | ||
| 286 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) | ||
| 287 | |||
| 288 | |||
| 289 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro | ||
| 290 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) | ||
| 291 | |||
| 292 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro | ||
| 293 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) | ||
| 294 | |||
| 295 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro | ||
| 296 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) | ||
| 297 | |||
| 298 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro | ||
| 299 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM) | ||
| 300 | |||
| 301 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro | ||
| 302 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM) | ||
| 303 | |||
| 304 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro | ||
| 305 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) | ||
| 306 | |||
| 307 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro | ||
| 308 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) | ||
| 309 | |||
| 310 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro | ||
| 311 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM) | ||
| 312 | |||
| 313 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro | ||
| 314 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM) | ||
| 315 | |||
| 316 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro | ||
| 317 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM) | ||
| 318 | |||
| 319 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro | ||
| 320 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM) | ||
| 321 | |||
| 322 | kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro | ||
| 323 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM) | ||
| 324 | |||
| 325 | kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro | ||
| 326 | cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM) | ||
| 327 | |||
| 328 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | ||
| 329 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) | ||
| 330 | |||
| 331 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro | ||
| 332 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) | ||
| 333 | |||
| 334 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro | ||
| 335 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) | ||
| 336 | |||
| 337 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro | ||
| 338 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) | ||
| 339 | |||
| 340 | gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro | ||
| 341 | cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM) | ||
| 342 | |||
| 343 | gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro | ||
| 344 | cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM) | ||
| 345 | |||
| 346 | pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro | ||
| 347 | cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM) | ||
| 348 | |||
| 349 | |||
| 350 | pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro | ||
| 351 | cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM) | ||
| 352 | |||
| 353 | pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro | ||
| 354 | cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM) | ||
| 355 | |||
| 356 | pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro | ||
| 357 | cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM) | ||
| 358 | |||
| 359 | pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro | ||
| 360 | cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM) | ||
| 361 | |||
| 362 | 229 | ||
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro index 7a3a96e..cb4eee3 100644 --- a/kdepim-desktop.pro +++ b/kdepim-desktop.pro | |||
| @@ -3,3 +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 = pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib gammu/emb/common gammu/emb/gammu libical libkcal microkde libkdepim kabc pwmanager/pwmanager korganizer kaddressbook kabc/plugins/file kabc/plugins/dir |
| 5 | #kalarmd | 5 | #kalarmd |
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp index 3f2d055..9d1d863 100644 --- a/pwmanager/pwmanager/main.cpp +++ b/pwmanager/pwmanager/main.cpp | |||
| @@ -205,2 +205,3 @@ int main(int argc, char *argv[]) | |||
| 205 | */ | 205 | */ |
| 206 | qDebug("exec "); | ||
| 206 | a.exec(); | 207 | a.exec(); |
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index 26a44b1..c511661 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp | |||
| @@ -588,6 +588,6 @@ void PwM::addPwd_slot() | |||
| 588 | { | 588 | { |
| 589 | addPwd_slot(0, 0); | 589 | addPwd_slot1(0, 0); |
| 590 | } | 590 | } |
| 591 | 591 | ||
| 592 | void PwM::addPwd_slot(QString *pw, PwMDoc *_doc) | 592 | void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc) |
| 593 | { | 593 | { |
| @@ -657,11 +657,11 @@ void PwM::editPwd_slot() | |||
| 657 | { | 657 | { |
| 658 | editPwd_slot(0,0,0); | 658 | editPwd_slot3(0,0,0); |
| 659 | } | 659 | } |
| 660 | 660 | ||
| 661 | void PwM::editPwd_slot(const QString *category) | 661 | void PwM::editPwd_slot1(const QString *category) |
| 662 | { | 662 | { |
| 663 | editPwd_slot(category, 0, 0); | 663 | editPwd_slot3(category, 0, 0); |
| 664 | } | 664 | } |
| 665 | 665 | ||
| 666 | void PwM::editPwd_slot(const QString *category, const int *index, | 666 | void PwM::editPwd_slot3(const QString *category, const int *index, |
| 667 | PwMDoc *_doc) | 667 | PwMDoc *_doc) |
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h index fe1f7a1..116bc66 100644 --- a/pwmanager/pwmanager/pwm.h +++ b/pwmanager/pwmanager/pwm.h | |||
| @@ -136,4 +136,5 @@ public slots: | |||
| 136 | //US ENH : changed code to run with older MOC | 136 | //US ENH : changed code to run with older MOC |
| 137 | |||
| 137 | void addPwd_slot(); | 138 | void addPwd_slot(); |
| 138 | void addPwd_slot(QString *pw, PwMDoc *_doc); | 139 | void addPwd_slot1(QString *pw, PwMDoc *_doc); |
| 139 | /** manage/edit triggered */ | 140 | /** manage/edit triggered */ |
| @@ -141,5 +142,6 @@ public slots: | |||
| 141 | void editPwd_slot(); | 142 | void editPwd_slot(); |
| 142 | void editPwd_slot(const QString *category); | 143 | void editPwd_slot1(const QString *category); |
| 143 | void editPwd_slot(const QString *category = 0, const int *index = 0, | 144 | void editPwd_slot3(const QString *category = 0, const int *index = 0, |
| 144 | PwMDoc *_doc = 0); | 145 | PwMDoc *_doc = 0); |
| 146 | |||
| 145 | /** manage/delete triggered */ | 147 | /** manage/delete triggered */ |
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro index 34f7403..7f39c76 100644 --- a/pwmanager/pwmanager/pwmanager.pro +++ b/pwmanager/pwmanager/pwmanager.pro | |||
| @@ -2,10 +2,7 @@ TEMPLATE = app | |||
| 2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
| 3 | 3 | DESTDIR= ../../bin | |
| 4 | |||
| 5 | TARGET = pwmpi | 4 | TARGET = pwmpi |
| 6 | OBJECTS_DIR = obj/$(PLATFORM) | 5 | include( ../../variables.pri ) |
| 7 | MOC_DIR = moc/$(PLATFORM) | ||
| 8 | DESTDIR=$(QPEDIR)/bin | ||
| 9 | 6 | ||
| 10 | INCLUDEPATH += . ../../ ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include | 7 | INCLUDEPATH += . ../../ ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils |
| 11 | DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION | 8 | DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION |
| @@ -14,13 +11,7 @@ DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION | |||
| 14 | #DEFINES += CONFIG_DEBUG | 11 | #DEFINES += CONFIG_DEBUG |
| 15 | LIBS += -L../libcrypt/$(PLATFORM) | 12 | LIBS += -L../libcrypt/ |
| 13 | LIBS += -L../../bin/ | ||
| 16 | LIBS += -lmicrokde | 14 | LIBS += -lmicrokde |
| 17 | LIBS += -lmicroqtcompat | ||
| 18 | LIBS += -lmicrokdepim | 15 | LIBS += -lmicrokdepim |
| 19 | LIBS += -L$(QPEDIR)/lib | ||
| 20 | LIBS += -lqpe | ||
| 21 | LIBS += -lzlib | 16 | LIBS += -lzlib |
| 22 | #LIBS += -lbz2 | ||
| 23 | #LIBS += -lkpmicrogcrypt | ||
| 24 | LIBS += -ljpeg | ||
| 25 | LIBS += $(QTOPIALIB) | ||
| 26 | LIBS += -lkpmicrocipher | 17 | LIBS += -lkpmicrocipher |
| @@ -30,2 +21,16 @@ LIBS += -lstdc++ | |||
| 30 | 21 | ||
| 22 | unix:{ | ||
| 23 | OBJECTS_DIR = obj/unix | ||
| 24 | MOC_DIR = moc/unix | ||
| 25 | |||
| 26 | } | ||
| 27 | win32:{ | ||
| 28 | |||
| 29 | DEFINES += _WIN32_ | ||
| 30 | OBJECTS_DIR = obj/win | ||
| 31 | MOC_DIR = moc/win | ||
| 32 | QMAKE_LINK += /NODEFAULTLIB:LIBC | ||
| 33 | |||
| 34 | } | ||
| 35 | |||
| 31 | #INTERFACES = \ | 36 | #INTERFACES = \ |
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index e29e3d1..8869f3a 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp | |||
| @@ -2331,4 +2331,4 @@ PwMerror PwMDoc::exportToText(const QString *file) | |||
| 2331 | 2331 | ||
| 2332 | header += KGlobal::locale()->formatDate(currDate, true, KLocale::Userdefined); | 2332 | header += KGlobal::locale()->formatDate(currDate, true, KLocale::Userdefined).latin1(); |
| 2333 | header += KGlobal::locale()->formatTime(currTime, true); | 2333 | header += KGlobal::locale()->formatTime(currTime, true).latin1(); |
| 2334 | KGlobal::locale()->setDateFormatShort(dfs); | 2334 | KGlobal::locale()->setDateFormatShort(dfs); |
| @@ -3020,3 +3020,3 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s | |||
| 3020 | PwMSyncItem newSyncItemLocal; | 3020 | PwMSyncItem newSyncItemLocal; |
| 3021 | newSyncItemLocal.syncName = mCurrentSyncDevice; | 3021 | newSyncItemLocal.syncName = mCurrentSyncDevice.latin1(); |
| 3022 | newSyncItemLocal.lastSyncDate = mLastSync; | 3022 | newSyncItemLocal.lastSyncDate = mLastSync; |
| @@ -3040,3 +3040,3 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s | |||
| 3040 | PwMSyncItem newSyncItemRemote; | 3040 | PwMSyncItem newSyncItemRemote; |
| 3041 | newSyncItemRemote.syncName = mCurrentSyncName; | 3041 | newSyncItemRemote.syncName = mCurrentSyncName.latin1(); |
| 3042 | newSyncItemRemote.lastSyncDate = mLastSync; | 3042 | newSyncItemRemote.lastSyncDate = mLastSync; |
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp index 8946443..ea9e330 100644 --- a/pwmanager/pwmanager/pwminit.cpp +++ b/pwmanager/pwmanager/pwminit.cpp | |||
| @@ -21,2 +21,3 @@ | |||
| 21 | #include "randomizer.h" | 21 | #include "randomizer.h" |
| 22 | #include <qdir.h> | ||
| 22 | 23 | ||
| @@ -130,2 +131,3 @@ void PwMInit::initializeApp() | |||
| 130 | { | 131 | { |
| 132 | qDebug("PwMInit::initializeApp() "); | ||
| 131 | PWM_ASSERT(runStatus == unknown); | 133 | PWM_ASSERT(runStatus == unknown); |
| @@ -142,3 +144,3 @@ void PwMInit::initializeApp() | |||
| 142 | handleCmdLineArgs(); | 144 | handleCmdLineArgs(); |
| 143 | 145 | qDebug("handle "); | |
| 144 | bool openDeeplocked = false; | 146 | bool openDeeplocked = false; |
| @@ -147,5 +149,8 @@ void PwMInit::initializeApp() | |||
| 147 | openDeeplocked = true; | 149 | openDeeplocked = true; |
| 148 | if (conf()->confWndAutoMinimizeOnStart() || | 150 | if ( false ){ |
| 149 | savedCmd.minToTray) { | 151 | // LR is not working |
| 152 | //if (conf()->confWndAutoMinimizeOnStart() || | ||
| 153 | // savedCmd.minToTray) { | ||
| 150 | PwMDoc *newDoc = createDoc(); | 154 | PwMDoc *newDoc = createDoc(); |
| 155 | qDebug(" createDoc()"); | ||
| 151 | if (!newDoc->openDocUi(newDoc, | 156 | if (!newDoc->openDocUi(newDoc, |
| @@ -154,2 +159,3 @@ void PwMInit::initializeApp() | |||
| 154 | delete newDoc; | 159 | delete newDoc; |
| 160 | } | ||
| 155 | 161 | ||
| @@ -165,3 +171,3 @@ void PwMInit::initializeApp() | |||
| 165 | 171 | ||
| 166 | } | 172 | //} |
| 167 | } else { | 173 | } else { |
| @@ -288,2 +294,3 @@ PwM * PwMInit::createMainWnd(const QString &loadFile, | |||
| 288 | { | 294 | { |
| 295 | qDebug("PwMInit::createMainWnd "); | ||
| 289 | PwM *newWnd; | 296 | PwM *newWnd; |
| @@ -319,2 +326,3 @@ PwM * PwMInit::createMainWnd(const QString &loadFile, | |||
| 319 | newWnd->show(); | 326 | newWnd->show(); |
| 327 | qDebug("show "); | ||
| 320 | #endif //DESKTOP_VERSION | 328 | #endif //DESKTOP_VERSION |
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp index 2d6498e..ed0f754 100644 --- a/pwmanager/pwmanager/serializer.cpp +++ b/pwmanager/pwmanager/serializer.cpp | |||
| @@ -172,3 +172,7 @@ bool Serializer::parseXml(const QCString &buffer) | |||
| 172 | #else | 172 | #else |
| 173 | #ifdef DESKTOP_VERSION | ||
| 174 | if (!domDoc->setContent(buffer, true)) | ||
| 175 | #else | ||
| 173 | if (!domDoc->setContent(buffer)) | 176 | if (!domDoc->setContent(buffer)) |
| 177 | #endif | ||
| 174 | return false; | 178 | return false; |
| @@ -734,3 +738,3 @@ bool Serializer::readSyncData(const QDomNode &n, vector<PwMSyncItem> *dta) | |||
| 734 | 738 | ||
| 735 | curSync.syncName = devicename; | 739 | curSync.syncName = devicename.latin1(); |
| 736 | #ifndef PWM_EMBEDDED | 740 | #ifndef PWM_EMBEDDED |