summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-12 10:30:29 (UTC)
committer zautrix <zautrix>2004-09-12 10:30:29 (UTC)
commita3a24948c51aa2983e415c990eaf0db9ac3c0005 (patch) (unidiff)
tree558fee47ff2cacbb591c72b9ab16c830cc2f857a
parent31fab1d7e531b492d1075964ddcbebe7a563a41a (diff)
downloadkdepimpi-a3a24948c51aa2983e415c990eaf0db9ac3c0005.zip
kdepimpi-a3a24948c51aa2983e415c990eaf0db9ac3c0005.tar.gz
kdepimpi-a3a24948c51aa2983e415c990eaf0db9ac3c0005.tar.bz2
Desktop compile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile472
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp1
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp1
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp1
4 files changed, 173 insertions, 302 deletions
diff --git a/Makefile b/Makefile
index 01439bd..3be5bb3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,303 +1,171 @@
1export KDEPIMDIR = $(shell pwd) 1#############################################################################
2# Makefile for building: kdepim-desktop
3# Generated by qmake (1.07a) (Qt 3.3.2) on: Sun Sep 12 12:10:39 2004
4# Project: kdepim-desktop.pro
5# Template: subdirs
6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
7#############################################################################
8
9 MAKEFILE =Makefile
10 QMAKE =qmake
11DEL_FILE = rm -f
12CHK_DIR_EXISTS= test -d
13MKDIR = mkdir -p
14INSTALL_FILE=
15INSTALL_DIR =
16 SUBTARGETS = \
17 sub-gammu-emb-common \
18 sub-gammu-emb-gammu \
19 sub-libical \
20 sub-libkcal \
21 sub-microkde \
22 sub-libkdepim \
23 sub-kabc \
24 sub-korganizer \
25 sub-kaddressbook \
26 sub-kabc-plugins-file \
27 sub-kabc-plugins-dir
28
29first: all
30
31all: Makefile $(SUBTARGETS)
32
33gammu/emb/common/$(MAKEFILE):
34 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
35 cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
36sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
37 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
38
39gammu/emb/gammu/$(MAKEFILE):
40 @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
41 cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
42sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
43 cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
44
45libical/$(MAKEFILE):
46 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
47 cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
48sub-libical: libical/$(MAKEFILE) FORCE
49 cd libical && $(MAKE) -f $(MAKEFILE)
50
51libkcal/$(MAKEFILE):
52 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
53 cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
54sub-libkcal: libkcal/$(MAKEFILE) FORCE
55 cd libkcal && $(MAKE) -f $(MAKEFILE)
56
57microkde/$(MAKEFILE):
58 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
59 cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
60sub-microkde: microkde/$(MAKEFILE) FORCE
61 cd microkde && $(MAKE) -f $(MAKEFILE)
62
63libkdepim/$(MAKEFILE):
64 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
65 cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
66sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
67 cd libkdepim && $(MAKE) -f $(MAKEFILE)
68
69kabc/$(MAKEFILE):
70 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
71 cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
72sub-kabc: kabc/$(MAKEFILE) FORCE
73 cd kabc && $(MAKE) -f $(MAKEFILE)
74
75korganizer/$(MAKEFILE):
76 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
77 cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
78sub-korganizer: korganizer/$(MAKEFILE) FORCE
79 cd korganizer && $(MAKE) -f $(MAKEFILE)
80
81kaddressbook/$(MAKEFILE):
82 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
83 cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
84sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
85 cd kaddressbook && $(MAKE) -f $(MAKEFILE)
86
87kabc/plugins/file/$(MAKEFILE):
88 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
89 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
90sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
91 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
92
93kabc/plugins/dir/$(MAKEFILE):
94 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
95 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
96sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
97 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
98
99Makefile: kdepim-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf
100 $(QMAKE) -o Makefile kdepim-desktop.pro
101qmake: qmake_all
102 @$(QMAKE) -o Makefile kdepim-desktop.pro
103
104all: $(SUBTARGETS)
105qmake_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)
106 ( [ -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
108 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
109 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
110 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
111 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
112 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
113 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
114 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
115 ( [ -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
117clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
118 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
119 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
120 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
121 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
122 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
123 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
124 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
125 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
126 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
127 ( [ -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
129uninstall_subdirs: qmake_all FORCE
130 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
131 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
132 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
133 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
134 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
135 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
136 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
137 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
138 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
139 ( [ -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
141install_subdirs: qmake_all FORCE
142 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
143 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
144 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
145 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
146 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
147 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
148 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
149 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
150 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
151 ( [ -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
153distclean: qmake_all FORCE
154 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
155 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
156 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
157 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
158 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
159 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
160 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
161 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
162 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
163 ( [ -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
165
166install: install_subdirs
167
168uninstall: uninstall_subdirs
169
170FORCE:
2 171
3
4ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1
6endif
7
8ifneq ($(PLATFORM) , zaurus)
9 BUILD_NO_SHARP_PLUGIN=1
10endif
11
12SUBDIRS_MICROKDE = \
13 libical/src/libical \
14 libical/src/libicalss \
15 qtcompat \
16 microkde \
17 libkcal \
18 libkdepim \
19 kabc \
20 kabc/formats/binary \
21 kabc/plugins/file \
22 kabc/plugins/dir \
23 korganizer \
24 kalarmd \
25 kaddressbook
26
27SUBDIRS_QTOPIA_PLUGIN = \
28 kabc/plugins/qtopia
29
30SUBDIRS_OPIE_PLUGIN = \
31 kabc/plugins/opie
32
33SUBDIRS_SHARP_PLUGIN = \
34 kabc/plugins/sharpdtm
35
36SUBDIRS_LDAP_PLUGIN = \
37 kabc/plugins/ldap
38
39SUBDIRS_MICROMAIL = \
40 kmicromail/libetpan \
41 kmicromail/libmailwrapper \
42 kmicromail
43
44SUBDIRS_GAMMU = \
45 gammu/emb/common \
46 gammu/emb/gammu
47
48SUBDIRS = \
49 $(SUBDIRS_MICROKDE) \
50 $(SUBDIRS_QTOPIA_PLUGIN) \
51 $(SUBDIRS_OPIE_PLUGIN) \
52 $(SUBDIRS_SHARP_PLUGIN) \
53 $(SUBDIRS_LDAP_PLUGIN) \
54 $(SUBDIRS_MICROMAIL) \
55 $(SUBDIRS_GAMMU)
56
57all: build_microkde \
58 build_qtopia_plugin \
59 build_opie_plugin \
60 build_sharp_plugin \
61 build_ldap_plugin \
62 build_micromail \
63 build_gammu
64
65
66build_microkde: variable_test tmake
67 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
68 make -f Makefile$(PLATFORM) || exit 1; popd; \
69 done
70
71build_qtopia_plugin: build_microkde
72 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
73 make -f Makefile$(PLATFORM) || exit 1; popd; \
74 done
75
76build_opie_plugin: build_microkde
77 ifdef BUILD_NO_OPIE_PLUGIN
78 @echo == opie plugin not build.
79 else
80 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
81 make -f Makefile$(PLATFORM) || exit 1; popd; \
82 done
83 endif
84
85build_sharp_plugin: build_microkde
86 ifdef BUILD_NO_SHARP_PLUGIN
87 @echo == ldap plugin not build.
88 else
89 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
90 make -f Makefile$(PLATFORM) || exit 1; popd; \
91 done
92 endif
93
94build_ldap_plugin: build_microkde
95 ifdef BUILD_NO_LDAP_PLUGIN
96 @echo == ldap plugin not build.
97 else
98 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
99 make -f Makefile$(PLATFORM) || exit 1; popd; \
100 done
101 endif
102
103
104build_micromail: build_microkde
105 ifdef BUILD_NO_MICROMAIL
106 @echo == kmicromail not build.
107 else
108 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
109 make -f Makefile$(PLATFORM) || exit 1; popd; \
110 done
111 endif
112
113build_gammu: variable_test tmake
114 ifdef BUILD_NO_GAMMU
115 @echo == gammu not build.
116 else
117 for i in $(SUBDIRS_GAMMU); do pushd $$i; \
118 make -f Makefile$(PLATFORM) || exit 1; popd; \
119 done
120 endif
121
122
123variable_info:
124 @echo --------------------------------------
125 @echo KDEPIM buildsystem, variableinfo...
126 @echo KDEPIMDIR=$(KDEPIMDIR)
127 @echo QTDIR=$(QTDIR)
128 @echo QPEDIR=$(QPEDIR)
129 @echo OPIEDIR=$(OPIEDIR)
130 @echo PLATFORM=$(PLATFORM)
131 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
132 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
133 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
134 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
135 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
136 ifndef BUILD_NO_SHARP_PLUGIN
137 @echo SHARPDTMSDK=$(SHARPDTMSDK)
138 endif
139 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
140 @echo --------------------------------------
141
142variable_test: variable_info
143 @echo KDEPIM buildsystem, variablecheck...
144 ifndef KDEPIMDIR
145 @echo KDEPIMDIR is not defined.
146 $(error KDEPIMDIR is not defined)
147 endif
148 ifndef PLATFORM
149 @echo PLATFORM is not defined.
150 $(error PLATFORM is not defined)
151 endif
152 ifdef BUILD_NO_LDAP_PLUGIN
153 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
154 endif
155 ifdef BUILD_NO_OPIE_PLUGIN
156 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
157 endif
158 ifdef BUILD_NO_MICROMAIL
159 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
160 endif
161 ifdef BUILD_NO_SHARP_PLUGIN
162 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
163 else
164 ifndef SHARPDTMSDK
165 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
166 $(error SHARPDTMSDK is not defined)
167 endif
168 endif
169 ifdef BUILD_NO_GAMMU
170 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
171 endif
172 @echo --------------------------------------
173
174
175objects:
176 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
177 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
178 mkdir -p libical/lib/$(PLATFORM)
179
180clean:
181 rm -rf libical/lib/$(PLATFORM)/*;
182 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
183 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
184 done
185install:
186
187 cd bin/kdepim; make install
188 cp -r Pim $(QPEDIR)/apps
189 cp db2file/db2file $(QPEDIR)/bin/db2file
190 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
191 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
192 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
193
194dist:
195 @echo Dont forget to do "make install" before "make dist"
196 rm -f *arm.ipk
197 rm -f *~
198 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
199 ./mkipks kmicrokdelibs.control
200 ./mkipks korganizer.control
201 ./mkipks kaddressbook.control
202 ifndef BUILD_NO_MICROMAIL
203 ./mkipks kopiemail.control
204 endif
205 ./mkipks korganizer-alarm.control
206 ifndef BUILD_NO_GAMMU
207 ./mkipks kammu.control
208 endif
209 ./mkipks pim_TAB_icon.control
210
211tmake: objects \
212 qtcompat/Makefile$(PLATFORM) \
213 microkde/Makefile$(PLATFORM) \
214 libkcal/Makefile$(PLATFORM) \
215 libkdepim/Makefile$(PLATFORM) \
216 korganizer/Makefile$(PLATFORM) \
217 kalarmd/Makefile$(PLATFORM) \
218 libical/src/libical/Makefile$(PLATFORM) \
219 libical/src/libicalss/Makefile$(PLATFORM) \
220 kabc/Makefile$(PLATFORM) \
221 kabc/formats/binary/Makefile$(PLATFORM) \
222 kabc/plugins/file/Makefile$(PLATFORM) \
223 kabc/plugins/dir/Makefile$(PLATFORM) \
224 kabc/plugins/ldap/Makefile$(PLATFORM) \
225 kabc/plugins/opie/Makefile$(PLATFORM) \
226 kabc/plugins/qtopia/Makefile$(PLATFORM) \
227 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
228 kaddressbook/Makefile$(PLATFORM) \
229 kmicromail/Makefile$(PLATFORM) \
230 kmicromail/libetpan/Makefile$(PLATFORM) \
231 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
232 gammu/emb/common/Makefile$(PLATFORM) \
233 gammu/emb/gammu/Makefile$(PLATFORM) \
234
235
236
237
238qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
239 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
240
241microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
242 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM)
243
244libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
245 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM)
246
247
248libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
249 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM)
250
251kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
252 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM)
253
254korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
255 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM)
256
257libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
258 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM)
259
260libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
261 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM)
262
263kabc/Makefile$(PLATFORM): kabc/kabcE.pro
264 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM)
265
266kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
267 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
268
269kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
270 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" fileE.pro -o Makefile$(PLATFORM)
271
272kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
273 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" dirE.pro -o Makefile$(PLATFORM)
274
275kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
276 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" ldapE.pro -o Makefile$(PLATFORM)
277
278kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
279 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
280
281kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
282 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
283
284kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
285 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM)
286
287kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
288 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
289
290kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
291 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM)
292
293kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
294 cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM)
295
296kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
297 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM)
298
299gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
300 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" commonE.pro -o Makefile$(PLATFORM)
301
302gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
303 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" gammuE.pro -o Makefile$(PLATFORM)
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 49c0691..8d0fca1 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -5,48 +5,49 @@
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include <qdragobject.h> 24#include <qdragobject.h>
25#include <qevent.h> 25#include <qevent.h>
26#include <qiconview.h> 26#include <qiconview.h>
27#include <qlayout.h> 27#include <qlayout.h>
28#include <qstringlist.h> 28#include <qstringlist.h>
29#include <qregexp.h>
29 30
30#include <kabc/addressbook.h> 31#include <kabc/addressbook.h>
31#include <kabc/addressee.h> 32#include <kabc/addressee.h>
32#include <kconfig.h> 33#include <kconfig.h>
33#include <kdebug.h> 34#include <kdebug.h>
34#include <klocale.h> 35#include <klocale.h>
35 36
36#include "kabprefs.h" 37#include "kabprefs.h"
37#include "viewmanager.h" 38#include "viewmanager.h"
38 39
39#include "kaddressbookcardview.h" 40#include "kaddressbookcardview.h"
40 41
41#ifndef KAB_EMBEDDED 42#ifndef KAB_EMBEDDED
42extern "C" { 43extern "C" {
43 void *init_libkaddrbk_cardview() 44 void *init_libkaddrbk_cardview()
44 { 45 {
45 return ( new CardViewFactory ); 46 return ( new CardViewFactory );
46 } 47 }
47} 48}
48#endif //KAB_EMBEDDED 49#endif //KAB_EMBEDDED
49 50
50//////////////////////////////// 51////////////////////////////////
51// AddresseeCardViewItem (internal class) 52// AddresseeCardViewItem (internal class)
52class AddresseeCardViewItem : public CardViewItem 53class AddresseeCardViewItem : public CardViewItem
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 78d63b0..0ffc674 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -19,48 +19,49 @@
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#ifndef KAB_EMBEDDED 24#ifndef KAB_EMBEDDED
25#include <qiconview.h> 25#include <qiconview.h>
26#include <qstringlist.h> 26#include <qstringlist.h>
27 27
28#include <kabc/addressee.h> 28#include <kabc/addressee.h>
29#include <kconfig.h> 29#include <kconfig.h>
30#include <kdebug.h> 30#include <kdebug.h>
31#include <kglobal.h> 31#include <kglobal.h>
32#include <kiconloader.h> 32#include <kiconloader.h>
33#include <klocale.h> 33#include <klocale.h>
34 34
35#else //KAB_EMBEDDED 35#else //KAB_EMBEDDED
36#endif //KAB_EMBEDDED 36#endif //KAB_EMBEDDED
37 37
38#include <kabc/addressbook.h> 38#include <kabc/addressbook.h>
39#include "kabprefs.h" 39#include "kabprefs.h"
40#include "viewmanager.h" 40#include "viewmanager.h"
41#include "kaddressbookiconview.h" 41#include "kaddressbookiconview.h"
42#include <qlayout.h> 42#include <qlayout.h>
43#include <qregexp.h>
43#include <kglobal.h> 44#include <kglobal.h>
44/*US transfered to the headerfile 45/*US transfered to the headerfile
45class IconViewFactory : public ViewFactory 46class IconViewFactory : public ViewFactory
46{ 47{
47 public: 48 public:
48 KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name ) 49 KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
49 { 50 {
50 return new KAddressBookIconView( ab, parent, name ); 51 return new KAddressBookIconView( ab, parent, name );
51 } 52 }
52 53
53 QString type() const { return "Icon"; } 54 QString type() const { return "Icon"; }
54 55
55 QString description() const { return i18n( "Icons represent contacts. Very simple view." ); } 56 QString description() const { return i18n( "Icons represent contacts. Very simple view." ); }
56}; 57};
57 58
58*/ 59*/
59 60
60extern "C" { 61extern "C" {
61 void *init_libkaddrbk_iconview() 62 void *init_libkaddrbk_iconview()
62 { 63 {
63 return ( new IconViewFactory ); 64 return ( new IconViewFactory );
64 } 65 }
65} 66}
66 67
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 63ad0ed..1dc9198 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -12,48 +12,49 @@
12#include <qurl.h> 12#include <qurl.h>
13#include <qpixmap.h> 13#include <qpixmap.h>
14 14
15#include <kabc/addressbook.h> 15#include <kabc/addressbook.h>
16#include <kapplication.h> 16#include <kapplication.h>
17#include <kconfig.h> 17#include <kconfig.h>
18#include <kcolorbutton.h> 18#include <kcolorbutton.h>
19#include <kdebug.h> 19#include <kdebug.h>
20#include <kglobal.h> 20#include <kglobal.h>
21#include <kiconloader.h> 21#include <kiconloader.h>
22#include <klineedit.h> 22#include <klineedit.h>
23#include <klocale.h> 23#include <klocale.h>
24#include <kmessagebox.h> 24#include <kmessagebox.h>
25#include <kurl.h> 25#include <kurl.h>
26#include <kurlrequester.h> 26#include <kurlrequester.h>
27 27
28//US#include "configuretableviewdialog.h" 28//US#include "configuretableviewdialog.h"
29#include "contactlistview.h" 29#include "contactlistview.h"
30#include "kabprefs.h" 30#include "kabprefs.h"
31#include "undocmds.h" 31#include "undocmds.h"
32#include "viewmanager.h" 32#include "viewmanager.h"
33 33
34#include <qlayout.h> 34#include <qlayout.h>
35#include <qheader.h> 35#include <qheader.h>
36#include <qregexp.h>
36 37
37#include "kaddressbooktableview.h" 38#include "kaddressbooktableview.h"
38 39
39 40
40KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, 41KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
41 QWidget *parent, const char *name ) 42 QWidget *parent, const char *name )
42 : KAddressBookView( ab, parent, name ) 43 : KAddressBookView( ab, parent, name )
43{ 44{
44 mainLayout = new QVBoxLayout( viewWidget(), 2 ); 45 mainLayout = new QVBoxLayout( viewWidget(), 2 );
45 46
46 // The list view will be created when the config is read. 47 // The list view will be created when the config is read.
47 mListView = 0; 48 mListView = 0;
48} 49}
49 50
50KAddressBookTableView::~KAddressBookTableView() 51KAddressBookTableView::~KAddressBookTableView()
51{ 52{
52} 53}
53 54
54void KAddressBookTableView::reconstructListView() 55void KAddressBookTableView::reconstructListView()
55{ 56{
56 if (mListView) 57 if (mListView)
57 { 58 {
58 disconnect(mListView, SIGNAL(selectionChanged()), 59 disconnect(mListView, SIGNAL(selectionChanged()),
59 this, SLOT(addresseeSelected())); 60 this, SLOT(addresseeSelected()));