summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-03 21:03:06 (UTC)
committer zautrix <zautrix>2005-04-03 21:03:06 (UTC)
commitf3707f1dcc3d42d43c9e6b649a9a68b2e706051e (patch) (unidiff)
treecad8019b110d59bd76a2901494259f2971c160b7
parent2d83daf3568bb829db2530baa917db5a4cbf0768 (diff)
downloadkdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.zip
kdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.tar.gz
kdepimpi-f3707f1dcc3d42d43c9e6b649a9a68b2e706051e.tar.bz2
static fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile566
-rw-r--r--kabc/plugins/dir/dir.pro2
-rw-r--r--kabc/plugins/file/file.pro2
-rw-r--r--kabc/plugins/qtopia/qtopia.pro2
-rw-r--r--kaddressbook/kaddressbook.pro11
-rw-r--r--korganizer/korganizer.pro14
-rw-r--r--microkde/kresources/factory.cpp26
-rw-r--r--microkde/kresources/managerimpl.cpp2
-rw-r--r--microkde/microkde.pro8
9 files changed, 246 insertions, 387 deletions
diff --git a/Makefile b/Makefile
index 594d47d..b873179 100644
--- a/Makefile
+++ b/Makefile
@@ -1,385 +1,183 @@
1export KDEPIMDIR = $(shell pwd) 1#############################################################################
2 2# Makefile for building: kdepim-desktop
3export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version) 3# Generated by qmake (1.07a) (Qt 3.3.4) on: Sun Apr 3 21:52:20 2005
4 4# Project: kdepim-desktop.pro
5ifeq ($(PLATFORM) , zaurus) 5# Template: subdirs
6 BUILD_NO_LDAP_PLUGIN=1 6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
7endif 7#############################################################################
8 8
9ifneq ($(PLATFORM) , zaurus) 9 MAKEFILE =Makefile
10 BUILD_NO_SHARP_PLUGIN=1 10 QMAKE =qmake
11endif 11DEL_FILE = rm -f
12 12CHK_DIR_EXISTS= test -d
13#opie plugin is deprecated. The qtopia plugin handles the task from now on. 13MKDIR = mkdir -p
14BUILD_NO_OPIE_PLUGIN=1 14INSTALL_FILE=
15 15INSTALL_DIR =
16SUBDIRS_MICROKDE = \ 16 SUBTARGETS = \
17 libical/src/libical \ 17 sub-libical \
18 libical/src/libicalss \ 18 sub-libkcal \
19 qtcompat \ 19 sub-kabc \
20 microkde \ 20 sub-libkdepim \
21 libkcal \ 21 sub-microkde \
22 libkdepim \ 22 sub-korganizer \
23 kabc \ 23 sub-kaddressbook \
24 kabc/formats/binary \ 24 sub-kabc-plugins-file \
25 kabc/plugins/file \ 25 sub-kabc-plugins-dir \
26 kabc/plugins/dir \ 26 sub-kabc-plugins-qtopia \
27 korganizer \ 27 sub-gammu-emb-common \
28 kalarmd \ 28 sub-gammu-emb-gammu
29 kaddressbook 29
30 30first: all
31SUBDIRS_QTOPIA_PLUGIN = \ 31
32 kabc/plugins/qtopia 32all: Makefile $(SUBTARGETS)
33 33
34SUBDIRS_OPIE_PLUGIN = \ 34libical/$(MAKEFILE):
35 kabc/plugins/opie 35 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
36 36 cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
37SUBDIRS_SHARP_PLUGIN = \ 37sub-libical: libical/$(MAKEFILE) FORCE
38 kabc/plugins/sharpdtm 38 cd libical && $(MAKE) -f $(MAKEFILE)
39 39
40SUBDIRS_LDAP_PLUGIN = \ 40libkcal/$(MAKEFILE):
41 kabc/plugins/ldap 41 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
42 42 cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
43SUBDIRS_MICROMAIL = \ 43sub-libkcal: libkcal/$(MAKEFILE) FORCE
44 libetpan \ 44 cd libkcal && $(MAKE) -f $(MAKEFILE)
45 kmicromail/libmailwrapper \ 45
46 kmicromail 46kabc/$(MAKEFILE):
47 47 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
48SUBDIRS_GAMMU = \ 48 cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
49 gammu/emb/common \ 49sub-kabc: kabc/$(MAKEFILE) FORCE
50 gammu/emb/gammu 50 cd kabc && $(MAKE) -f $(MAKEFILE)
51 51
52SUBDIRS_PWMANAGER = \ 52libkdepim/$(MAKEFILE):
53 pwmanager/libcrypt/mpi \ 53 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
54 pwmanager/libcrypt/error \ 54 cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
55 pwmanager/libcrypt/cipher \ 55sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
56 pwmanager/libcrypt/zlib \ 56 cd libkdepim && $(MAKE) -f $(MAKEFILE)
57 pwmanager/pwmanager 57
58 58microkde/$(MAKEFILE):
59SUBDIRS = \ 59 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
60 $(SUBDIRS_MICROKDE) \ 60 cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
61 $(SUBDIRS_QTOPIA_PLUGIN) \ 61sub-microkde: microkde/$(MAKEFILE) FORCE
62 $(SUBDIRS_OPIE_PLUGIN) \ 62 cd microkde && $(MAKE) -f $(MAKEFILE)
63 $(SUBDIRS_SHARP_PLUGIN) \ 63
64 $(SUBDIRS_LDAP_PLUGIN) \ 64korganizer/$(MAKEFILE):
65 $(SUBDIRS_MICROMAIL) \ 65 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
66 $(SUBDIRS_GAMMU) \ 66 cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
67 $(SUBDIRS_PWMANAGER) 67sub-korganizer: korganizer/$(MAKEFILE) FORCE
68 68 cd korganizer && $(MAKE) -f $(MAKEFILE)
69 69
70all: build_microkde \ 70kaddressbook/$(MAKEFILE):
71 build_qtopia_plugin \ 71 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
72 build_opie_plugin \ 72 cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
73 build_sharp_plugin \ 73sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
74 build_ldap_plugin \ 74 cd kaddressbook && $(MAKE) -f $(MAKEFILE)
75 build_micromail \ 75
76 build_gammu \ 76kabc/plugins/file/$(MAKEFILE):
77 build_pwmanager 77 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
78 78 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
79 79sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
80build_microkde: variable_test tmake 80 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
81 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 81
82 make -f Makefile$(PLATFORM) || exit 1; popd; \ 82kabc/plugins/dir/$(MAKEFILE):
83 done 83 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
84 84 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
85build_qtopia_plugin: build_microkde 85sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
86 ifdef BUILD_NO_QTOPIA_PLUGIN 86 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
87 @echo == qtopia plugin not build. 87
88 else 88kabc/plugins/qtopia/$(MAKEFILE):
89 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 89 @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia"
90 make -f Makefile$(PLATFORM) || exit 1; popd; \ 90 cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE)
91 done 91sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE
92 endif 92 cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE)
93 93
94build_opie_plugin: build_microkde 94gammu/emb/common/$(MAKEFILE):
95 ifdef BUILD_NO_OPIE_PLUGIN 95 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
96 @echo == opie plugin not build. 96 cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
97 else 97sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
98 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 98 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
99 make -f Makefile$(PLATFORM) || exit 1; popd; \ 99
100 done 100gammu/emb/gammu/$(MAKEFILE):
101 endif 101 @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
102 102 cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
103build_sharp_plugin: build_microkde 103sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
104 ifdef BUILD_NO_SHARP_PLUGIN 104 cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
105 @echo == ldap plugin not build. 105
106 else 106Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf variables.pri
107 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ 107 $(QMAKE) -o Makefile kdepim-desktop.pro
108 make -f Makefile$(PLATFORM) || exit 1; popd; \ 108qmake: qmake_all
109 done 109 @$(QMAKE) -o Makefile kdepim-desktop.pro
110 endif 110
111 111all: $(SUBTARGETS)
112build_ldap_plugin: build_microkde 112qmake_all: libical/$(MAKEFILE) libkcal/$(MAKEFILE) kabc/$(MAKEFILE) libkdepim/$(MAKEFILE) microkde/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE)
113 ifdef BUILD_NO_LDAP_PLUGIN 113 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
114 @echo == ldap plugin not build. 114 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
115 else 115 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
116 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ 116 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
117 make -f Makefile$(PLATFORM) || exit 1; popd; \ 117 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
118 done 118 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
119 endif 119 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
120 120 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
121 121 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
122build_micromail: build_microkde 122 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
123 ifdef BUILD_NO_MICROMAIL 123 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
124 @echo == kmicromail not build. 124 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
125 else 125clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
126 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ 126 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
127 make -f Makefile$(PLATFORM) || exit 1; popd; \ 127 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
128 done 128 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
129 endif 129 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
130 130 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
131build_gammu: variable_test tmake 131 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
132 ifdef BUILD_NO_GAMMU 132 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
133 @echo == gammu not build. 133 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
134 else 134 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
135 for i in $(SUBDIRS_GAMMU); do pushd $$i; \ 135 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
136 make -f Makefile$(PLATFORM) || exit 1; popd; \ 136 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
137 done 137 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
138 endif 138uninstall_subdirs: qmake_all FORCE
139 139 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
140build_pwmanager: build_microkde 140 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
141 ifdef BUILD_NO_PWMANAGER 141 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
142 @echo == pwmanager not build. 142 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
143 else 143 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
144 for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ 144 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
145 make -f Makefile$(PLATFORM) || exit 1; popd; \ 145 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
146 done 146 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
147 endif 147 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
148 148 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
149 149 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
150variable_info: 150 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
151 @echo -------------------------------------- 151install_subdirs: qmake_all FORCE
152 @echo KDEPIM buildsystem, variableinfo... 152 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
153 @echo KDEPIMDIR=$(KDEPIMDIR) 153 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
154 @echo QTDIR=$(QTDIR) 154 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
155 @echo QPEDIR=$(QPEDIR) 155 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
156 @echo OPIEDIR=$(OPIEDIR) 156 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
157 @echo PLATFORM=$(PLATFORM) 157 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
158 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 158 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 159 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 160 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 161 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true
162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) 162 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 163 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
164 ifndef BUILD_NO_SHARP_PLUGIN 164distclean: qmake_all FORCE
165 @echo SHARPDTMSDK=$(SHARPDTMSDK) 165 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
166 endif 166 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 167 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 168 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
169 @echo -------------------------------------- 169 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
170 170 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
171variable_test: variable_info 171 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
172 @echo KDEPIM buildsystem, variablecheck... 172 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
173 ifndef KDEPIMDIR 173 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
174 @echo KDEPIMDIR is not defined. 174 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
175 $(error KDEPIMDIR is not defined) 175 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
176 endif 176 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
177 ifndef PLATFORM 177
178 @echo PLATFORM is not defined. 178install: install_subdirs
179 $(error PLATFORM is not defined) 179
180 endif 180uninstall: uninstall_subdirs
181 ifdef BUILD_NO_LDAP_PLUGIN 181
182 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 182FORCE:
183 endif
184 ifdef BUILD_NO_OPIE_PLUGIN
185 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
186 endif
187 ifdef BUILD_NO_QTOPIA_PLUGIN
188 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
189 endif
190 ifdef BUILD_NO_MICROMAIL
191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
192 endif
193 ifdef BUILD_NO_SHARP_PLUGIN
194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
195 else
196 ifndef SHARPDTMSDK
197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
198 $(error SHARPDTMSDK is not defined)
199 endif
200 endif
201 ifdef BUILD_NO_GAMMU
202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
203 endif
204 ifdef BUILD_NO_PWMANAGER
205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
206 endif
207 @echo --------------------------------------
208
209
210objects:
211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
213 mkdir -p libical/lib/$(PLATFORM)
214 mkdir -p dest
215 mkdir -p dest$(LIBICAL_PATH)
216 mkdir -p pwmanager/libcrypt/$(PLATFORM)
217
218clean:
219 rm -rf libical/lib/$(PLATFORM)/*;
220 rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
221 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
222 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
223 done
224
225pac:
226 rm -f $(QPEDIR)/lib/libmicro*
227 rm -f $(QPEDIR)/plugins/applets/libkopi*
228 make
229 make install
230 make dist
231install:
232
233 cd bin/kdepim; make install
234 cp -r Pim $(QPEDIR)/apps
235 cp db2file/db2file $(QPEDIR)/bin/db2file
236 chmod ugo+x $(QPEDIR)/bin/db2file
237 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
238 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
239 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
240 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
241
242dist:
243 @echo Dont forget to do "make install" before "make dist"
244 rm -f *arm.ipk
245 rm -f *ipk.zip
246 rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
247 rm -f *~
248 cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
249 cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
250 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
251 mkipks kmicrokdelibs.control
252 mkipks korganizer.control
253 mkipks kaddressbook.control
254 ifndef BUILD_NO_MICROMAIL
255 mkipks kopiemail.control
256 endif
257 ifndef BUILD_NO_SHARP_PLUGIN
258 mkipks ksharpPIM-DTMaccess.control
259 endif
260 mkipks korganizer-alarm.control
261 ifndef BUILD_NO_GAMMU
262 mkipks kmobilephoneaccess.control
263 endif
264 ifndef BUILD_NO_PWMANAGER
265 mkipks pwmanager.control
266 endif
267 mkipks pimTABicon.control
268 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
269 mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
270 mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
271 mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
272
273tmake: objects \
274 qtcompat/Makefile$(PLATFORM) \
275 microkde/Makefile$(PLATFORM) \
276 libkcal/Makefile$(PLATFORM) \
277 libkdepim/Makefile$(PLATFORM) \
278 korganizer/Makefile$(PLATFORM) \
279 kalarmd/Makefile$(PLATFORM) \
280 libical/src/libical/Makefile$(PLATFORM) \
281 libical/src/libicalss/Makefile$(PLATFORM) \
282 kabc/Makefile$(PLATFORM) \
283 kabc/formats/binary/Makefile$(PLATFORM) \
284 kabc/plugins/file/Makefile$(PLATFORM) \
285 kabc/plugins/dir/Makefile$(PLATFORM) \
286 kabc/plugins/ldap/Makefile$(PLATFORM) \
287 kabc/plugins/opie/Makefile$(PLATFORM) \
288 kabc/plugins/qtopia/Makefile$(PLATFORM) \
289 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
290 kaddressbook/Makefile$(PLATFORM) \
291 kmicromail/Makefile$(PLATFORM) \
292 libetpan/Makefile$(PLATFORM) \
293 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
294 gammu/emb/common/Makefile$(PLATFORM) \
295 gammu/emb/gammu/Makefile$(PLATFORM) \
296 pwmanager/pwmanager/Makefile$(PLATFORM) \
297 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
298 pwmanager/libcrypt/error/Makefile$(PLATFORM) \
299 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
300 pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
301
302qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
303 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
304
305microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
306 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
307
308libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
309 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
310
311
312libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
313 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
314
315kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
316 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
317
318korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
319 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
320
321libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
322 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
323
324libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
325 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
326
327kabc/Makefile$(PLATFORM): kabc/kabcE.pro
328 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
329
330kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
331 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
332
333kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
334 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
335
336kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
337 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
338
339kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
340 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
341
342kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
343 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
344
345kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
346 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
347
348kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
349 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
350
351kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
352 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
353
354kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
355 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
356
357libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
358 cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
359
360kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
361 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
362
363gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
364 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
365
366gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
367 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
368
369pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
370 cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
371
372
373pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
374 cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
375
376pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
377 cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
378
379pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
380 cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
381
382pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
383 cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
384
385 183
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index a7c1503..3e18594 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -2,6 +2,8 @@ TEMPLATE = lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3#release debug 3#release debug
4 4
5include( ../../../variables.pri )
6
5TARGET = microkabc_dir 7TARGET = microkabc_dir
6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat 8INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
7DESTDIR = ../../../bin 9DESTDIR = ../../../bin
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 154ef2a..2d17313 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -2,6 +2,8 @@ TEMPLATE = lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3#release debug 3#release debug
4 4
5include( ../../../variables.pri )
6
5TARGET = microkabc_file 7TARGET = microkabc_file
6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat 8INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
7 9
diff --git a/kabc/plugins/qtopia/qtopia.pro b/kabc/plugins/qtopia/qtopia.pro
index 0360abf..64d1abc 100644
--- a/kabc/plugins/qtopia/qtopia.pro
+++ b/kabc/plugins/qtopia/qtopia.pro
@@ -1,6 +1,8 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3 3
4include( ../../../variables.pri )
5
4TARGET = microkabc_qtopia 6TARGET = microkabc_qtopia
5 7
6INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources 8INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 2534835..7203eb3 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -12,12 +12,23 @@ DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
12unix : { 12unix : {
13 13
14staticlib: { 14staticlib: {
15LIBS += ../bin/libmicrokabc_qtopia.a
16LIBS += ../bin/libmicrokabc_file.a
17LIBS += ../bin/libmicrokabc_dir.a
18LIBS += ../bin/libmicrokdepim.a
19LIBS += ../bin/libmicrokcal.a
20LIBS += ../bin/libmicrokabc.a
21LIBS += ../bin/libmicrokde.a
22LIBS += ../bin/libmicrokabc_qtopia.a
23LIBS += ../bin/libmicrokabc_file.a
24LIBS += ../bin/libmicrokabc_dir.a
15LIBS += ../bin/libmicrokdepim.a 25LIBS += ../bin/libmicrokdepim.a
16LIBS += ../bin/libmicrokcal.a 26LIBS += ../bin/libmicrokcal.a
17LIBS += ../bin/libmicrokabc.a 27LIBS += ../bin/libmicrokabc.a
18LIBS += ../bin/libmicrokde.a 28LIBS += ../bin/libmicrokde.a
19LIBS += ../libical/lib/libical.a 29LIBS += ../libical/lib/libical.a
20LIBS += ../libical/lib/libicalss.a 30LIBS += ../libical/lib/libicalss.a
31
21} else { 32} else {
22LIBS += ../bin/libmicrokdepim.so 33LIBS += ../bin/libmicrokdepim.so
23LIBS += ../bin/libmicrokde.so 34LIBS += ../bin/libmicrokde.so
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 59a1a84..1a81c7d 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,5 +1,5 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on 2 CONFIG = qt warn_on
3 TARGET = kopi 3 TARGET = kopi
4OBJECTS_DIR = _obj/ 4OBJECTS_DIR = _obj/
5MOC_DIR = _moc 5MOC_DIR = _moc
@@ -15,7 +15,17 @@ DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
15DEFINES += KORG_NOLVALTERNATION 15DEFINES += KORG_NOLVALTERNATION
16DEFINES += DESKTOP_VERSION 16DEFINES += DESKTOP_VERSION
17unix : { 17unix : {
18staticlib: { 18staticlib: {
19LIBS += ../bin/libmicrokabc_qtopia.a
20LIBS += ../bin/libmicrokabc_file.a
21LIBS += ../bin/libmicrokabc_dir.a
22LIBS += ../bin/libmicrokdepim.a
23LIBS += ../bin/libmicrokcal.a
24LIBS += ../bin/libmicrokabc.a
25LIBS += ../bin/libmicrokde.a
26LIBS += ../bin/libmicrokabc_qtopia.a
27LIBS += ../bin/libmicrokabc_file.a
28LIBS += ../bin/libmicrokabc_dir.a
19LIBS += ../bin/libmicrokdepim.a 29LIBS += ../bin/libmicrokdepim.a
20LIBS += ../bin/libmicrokcal.a 30LIBS += ../bin/libmicrokcal.a
21LIBS += ../bin/libmicrokabc.a 31LIBS += ../bin/libmicrokabc.a
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index a3b7fff..5fbfa68 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -34,6 +34,11 @@
34#include "resource.h" 34#include "resource.h"
35#include "factory.h" 35#include "factory.h"
36 36
37#ifdef STATIC_RESOURCES
38#include <file/resourcefile.h>
39#include <dir/resourcedir.h>
40#include <qtopia/resourceqtopia.h>
41#endif
37using namespace KRES; 42using namespace KRES;
38 43
39QDict<Factory> *Factory::mSelves = 0; 44QDict<Factory> *Factory::mSelves = 0;
@@ -219,6 +224,25 @@ Resource *Factory::resource( const QString& type, const KConfig *config )
219 if ( type.isEmpty() || !mTypeMap.contains( type ) ) 224 if ( type.isEmpty() || !mTypeMap.contains( type ) )
220 return 0; 225 return 0;
221 226
227#ifdef STATIC_RESOURCES
228 qDebug("NEW STATIC RESOURCE %s", type.latin1());
229 Resource *resource = 0;
230 if ( type == "file" ) {
231 resource = (Resource *) new KABC::ResourceFile( config );
232 } else if ( type == "dir" ) {
233 resource = new KABC::ResourceDir( config );
234 } else if ( type == "qtopia" ) {
235 resource = new KABC::ResourceQtopia( config );
236 }
237 if ( !resource)
238 qDebug("Factory::resource:: resources are statically linked. resource type %s is not supported ",type.latin1() );
239 else
240 resource->setType( type );
241 return resource;
242#else
243
244
245
222/*US load the lib not dynamicly. !! 246/*US load the lib not dynamicly. !!
223 KService::Ptr ptr = mTypeMap[ type ]; 247 KService::Ptr ptr = mTypeMap[ type ];
224 KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() ); 248 KLibFactory *factory = KLibLoader::self()->factory( ptr->library().latin1() );
@@ -253,4 +277,6 @@ Resource *Factory::resource( const QString& type, const KConfig *config )
253 resource->setType( type ); 277 resource->setType( type );
254 278
255 return resource; 279 return resource;
280
281#endif
256} 282}
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index 566b8f4..a6d2007 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -40,6 +40,8 @@ $Id$
40#include "factory.h" 40#include "factory.h"
41#include "managerimpl.h" 41#include "managerimpl.h"
42 42
43
44
43using namespace KRES; 45using namespace KRES;
44 46
45ManagerImpl::ManagerImpl( const QString &family ) 47ManagerImpl::ManagerImpl( const QString &family )
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 9016260..783ec34 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -1,5 +1,6 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3include( ../variables.pri )
3#INCLUDEPATH += $(QTDIR)/include . 4#INCLUDEPATH += $(QTDIR)/include .
4#DEPENDPATH += $(QTDIR)/include 5#DEPENDPATH += $(QTDIR)/include
5INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio 6INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
@@ -9,6 +10,12 @@ TARGET = microkde
9DESTDIR= ../bin 10DESTDIR= ../bin
10DEFINES += DESKTOP_VERSION KDE_QT_ONLY 11DEFINES += DESKTOP_VERSION KDE_QT_ONLY
11unix : { 12unix : {
13staticlib: {
14INCLUDEPATH += ../kabc/plugins
15DEFINES += STATIC_RESOURCES
16}
17
18
12OBJECTS_DIR = obj/unix 19OBJECTS_DIR = obj/unix
13MOC_DIR = moc/unix 20MOC_DIR = moc/unix
14} 21}
@@ -17,7 +24,6 @@ DEFINES += _WIN32_
17OBJECTS_DIR = obj/win 24OBJECTS_DIR = obj/win
18MOC_DIR = moc/win 25MOC_DIR = moc/win
19} 26}
20include( ../variables.pri )
21 27
22 28
23 29