summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-08-30 21:21:12 (UTC)
committer zautrix <zautrix>2004-08-30 21:21:12 (UTC)
commit9bd5f28b42d2fc569cd92ece73282f3dc6491d4d (patch) (unidiff)
treec7e820667c25952048cdf604e0ca91f61b22c077
parenta415f6b4188fe9fc7a7c8d530def31d0877a8073 (diff)
downloadkdepimpi-9bd5f28b42d2fc569cd92ece73282f3dc6491d4d.zip
kdepimpi-9bd5f28b42d2fc569cd92ece73282f3dc6491d4d.tar.gz
kdepimpi-9bd5f28b42d2fc569cd92ece73282f3dc6491d4d.tar.bz2
Makefile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--Makefile.Embedded4
-rw-r--r--kammu.control (renamed from gammu.control)0
-rwxr-xr-xsetQtopia1
-rw-r--r--setZaurus1
5 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index b7e0e33..7cc6952 100644
--- a/Makefile
+++ b/Makefile
@@ -1,43 +1,41 @@
1export KDEPIMDIR = $(shell pwd) 1export KDEPIMDIR = $(shell pwd)
2 2
3 3
4ifeq ($(PLATFORM) , zaurus) 4ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
6 BUILD_NO_GAMMU=1
7endif 6endif
8 7
9ifneq ($(PLATFORM) , zaurus) 8ifneq ($(PLATFORM) , zaurus)
10 BUILD_NO_SHARP_PLUGIN=1 9 BUILD_NO_SHARP_PLUGIN=1
11 BUILD_NO_GAMMU=1
12endif 10endif
13 11
14SUBDIRS_MICROKDE = \ 12SUBDIRS_MICROKDE = \
15 libical/src/libical \ 13 libical/src/libical \
16 libical/src/libicalss \ 14 libical/src/libicalss \
17 qtcompat \ 15 qtcompat \
18 microkde \ 16 microkde \
19 libkcal \ 17 libkcal \
20 libkdepim \ 18 libkdepim \
21 kabc \ 19 kabc \
22 kabc/formats/binary \ 20 kabc/formats/binary \
23 kabc/plugins/file \ 21 kabc/plugins/file \
24 kabc/plugins/dir \ 22 kabc/plugins/dir \
25 korganizer \ 23 korganizer \
26 kalarmd \ 24 kalarmd \
27 kaddressbook 25 kaddressbook
28 26
29SUBDIRS_QTOPIA_PLUGIN = \ 27SUBDIRS_QTOPIA_PLUGIN = \
30 kabc/plugins/qtopia 28 kabc/plugins/qtopia
31 29
32SUBDIRS_OPIE_PLUGIN = \ 30SUBDIRS_OPIE_PLUGIN = \
33 kabc/plugins/opie 31 kabc/plugins/opie
34 32
35SUBDIRS_SHARP_PLUGIN = \ 33SUBDIRS_SHARP_PLUGIN = \
36 kabc/plugins/sharpdtm 34 kabc/plugins/sharpdtm
37 35
38SUBDIRS_LDAP_PLUGIN = \ 36SUBDIRS_LDAP_PLUGIN = \
39 kabc/plugins/ldap 37 kabc/plugins/ldap
40 38
41SUBDIRS_MICROMAIL = \ 39SUBDIRS_MICROMAIL = \
42 kmicromail/libetpan \ 40 kmicromail/libetpan \
43 kmicromail/libmailwrapper \ 41 kmicromail/libmailwrapper \
@@ -172,65 +170,65 @@ variable_test: variable_info
172 170
173 171
174objects: 172objects:
175 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 173 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
176 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 174 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
177 mkdir -p libical/lib/$(PLATFORM) 175 mkdir -p libical/lib/$(PLATFORM)
178 176
179clean: 177clean:
180 rm -rf libical/lib/$(PLATFORM)/*; 178 rm -rf libical/lib/$(PLATFORM)/*;
181 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 179 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
182 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 180 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
183 done 181 done
184install: 182install:
185 cd bin/kdepim; make install 183 cd bin/kdepim; make install
186 cp db2file/db2file $(QPEDIR)/bin/db2file 184 cp db2file/db2file $(QPEDIR)/bin/db2file
187 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 185 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
188 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 186 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
189 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop 187 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
190 188
191dist: 189dist:
192 @echo Dont forget to do "make install" before "make dist" 190 @echo Dont forget to do "make install" before "make dist"
193 rm -f *arm.ipk 191 rm -f *arm.ipk
194 rm -f *~ 192 rm -f *~
195 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim 193 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
196 ./mkipks kmicrokdelibs.control 194 ./mkipks kmicrokdelibs.control
197 ./mkipks korganizer.control 195 ./mkipks korganizer.control
198 ./mkipks kaddressbook.control 196 ./mkipks kaddressbook.control
199 ifndef BUILD_NO_MICROMAIL 197 ifndef BUILD_NO_MICROMAIL
200 ./mkipks kopiemail.control 198 ./mkipks kopiemail.control
201 endif 199 endif
202 ./mkipks korganizer-alarm.control 200 ./mkipks korganizer-alarm.control
203 ifndef BUILD_NO_GAMMU 201 ifndef BUILD_NO_GAMMU
204 ./mkipks gammu.control 202 ./mkipks kammu.control
205 endif 203 endif
206 204
207tmake: objects \ 205tmake: objects \
208 qtcompat/Makefile$(PLATFORM) \ 206 qtcompat/Makefile$(PLATFORM) \
209 microkde/Makefile$(PLATFORM) \ 207 microkde/Makefile$(PLATFORM) \
210 libkcal/Makefile$(PLATFORM) \ 208 libkcal/Makefile$(PLATFORM) \
211 libkdepim/Makefile$(PLATFORM) \ 209 libkdepim/Makefile$(PLATFORM) \
212 korganizer/Makefile$(PLATFORM) \ 210 korganizer/Makefile$(PLATFORM) \
213 kalarmd/Makefile$(PLATFORM) \ 211 kalarmd/Makefile$(PLATFORM) \
214 libical/src/libical/Makefile$(PLATFORM) \ 212 libical/src/libical/Makefile$(PLATFORM) \
215 libical/src/libicalss/Makefile$(PLATFORM) \ 213 libical/src/libicalss/Makefile$(PLATFORM) \
216 kabc/Makefile$(PLATFORM) \ 214 kabc/Makefile$(PLATFORM) \
217 kabc/formats/binary/Makefile$(PLATFORM) \ 215 kabc/formats/binary/Makefile$(PLATFORM) \
218 kabc/plugins/file/Makefile$(PLATFORM) \ 216 kabc/plugins/file/Makefile$(PLATFORM) \
219 kabc/plugins/dir/Makefile$(PLATFORM) \ 217 kabc/plugins/dir/Makefile$(PLATFORM) \
220 kabc/plugins/ldap/Makefile$(PLATFORM) \ 218 kabc/plugins/ldap/Makefile$(PLATFORM) \
221 kabc/plugins/opie/Makefile$(PLATFORM) \ 219 kabc/plugins/opie/Makefile$(PLATFORM) \
222 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 220 kabc/plugins/qtopia/Makefile$(PLATFORM) \
223 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 221 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
224 kaddressbook/Makefile$(PLATFORM) \ 222 kaddressbook/Makefile$(PLATFORM) \
225 kmicromail/Makefile$(PLATFORM) \ 223 kmicromail/Makefile$(PLATFORM) \
226 kmicromail/libetpan/Makefile$(PLATFORM) \ 224 kmicromail/libetpan/Makefile$(PLATFORM) \
227 kmicromail/libmailwrapper/Makefile$(PLATFORM) \ 225 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
228 gammu/emb/common/Makefile$(PLATFORM) \ 226 gammu/emb/common/Makefile$(PLATFORM) \
229 gammu/emb/gammu/Makefile$(PLATFORM) \ 227 gammu/emb/gammu/Makefile$(PLATFORM) \
230 228
231 229
232 230
233 231
234qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro 232qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
235 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) 233 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
236 234
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b7e0e33..7cc6952 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -1,43 +1,41 @@
1export KDEPIMDIR = $(shell pwd) 1export KDEPIMDIR = $(shell pwd)
2 2
3 3
4ifeq ($(PLATFORM) , zaurus) 4ifeq ($(PLATFORM) , zaurus)
5 BUILD_NO_LDAP_PLUGIN=1 5 BUILD_NO_LDAP_PLUGIN=1
6 BUILD_NO_GAMMU=1
7endif 6endif
8 7
9ifneq ($(PLATFORM) , zaurus) 8ifneq ($(PLATFORM) , zaurus)
10 BUILD_NO_SHARP_PLUGIN=1 9 BUILD_NO_SHARP_PLUGIN=1
11 BUILD_NO_GAMMU=1
12endif 10endif
13 11
14SUBDIRS_MICROKDE = \ 12SUBDIRS_MICROKDE = \
15 libical/src/libical \ 13 libical/src/libical \
16 libical/src/libicalss \ 14 libical/src/libicalss \
17 qtcompat \ 15 qtcompat \
18 microkde \ 16 microkde \
19 libkcal \ 17 libkcal \
20 libkdepim \ 18 libkdepim \
21 kabc \ 19 kabc \
22 kabc/formats/binary \ 20 kabc/formats/binary \
23 kabc/plugins/file \ 21 kabc/plugins/file \
24 kabc/plugins/dir \ 22 kabc/plugins/dir \
25 korganizer \ 23 korganizer \
26 kalarmd \ 24 kalarmd \
27 kaddressbook 25 kaddressbook
28 26
29SUBDIRS_QTOPIA_PLUGIN = \ 27SUBDIRS_QTOPIA_PLUGIN = \
30 kabc/plugins/qtopia 28 kabc/plugins/qtopia
31 29
32SUBDIRS_OPIE_PLUGIN = \ 30SUBDIRS_OPIE_PLUGIN = \
33 kabc/plugins/opie 31 kabc/plugins/opie
34 32
35SUBDIRS_SHARP_PLUGIN = \ 33SUBDIRS_SHARP_PLUGIN = \
36 kabc/plugins/sharpdtm 34 kabc/plugins/sharpdtm
37 35
38SUBDIRS_LDAP_PLUGIN = \ 36SUBDIRS_LDAP_PLUGIN = \
39 kabc/plugins/ldap 37 kabc/plugins/ldap
40 38
41SUBDIRS_MICROMAIL = \ 39SUBDIRS_MICROMAIL = \
42 kmicromail/libetpan \ 40 kmicromail/libetpan \
43 kmicromail/libmailwrapper \ 41 kmicromail/libmailwrapper \
@@ -172,65 +170,65 @@ variable_test: variable_info
172 170
173 171
174objects: 172objects:
175 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done 173 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
176 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 174 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
177 mkdir -p libical/lib/$(PLATFORM) 175 mkdir -p libical/lib/$(PLATFORM)
178 176
179clean: 177clean:
180 rm -rf libical/lib/$(PLATFORM)/*; 178 rm -rf libical/lib/$(PLATFORM)/*;
181 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 179 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
182 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 180 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
183 done 181 done
184install: 182install:
185 cd bin/kdepim; make install 183 cd bin/kdepim; make install
186 cp db2file/db2file $(QPEDIR)/bin/db2file 184 cp db2file/db2file $(QPEDIR)/bin/db2file
187 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 185 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
188 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 186 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
189 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop 187 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
190 188
191dist: 189dist:
192 @echo Dont forget to do "make install" before "make dist" 190 @echo Dont forget to do "make install" before "make dist"
193 rm -f *arm.ipk 191 rm -f *arm.ipk
194 rm -f *~ 192 rm -f *~
195 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim 193 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim
196 ./mkipks kmicrokdelibs.control 194 ./mkipks kmicrokdelibs.control
197 ./mkipks korganizer.control 195 ./mkipks korganizer.control
198 ./mkipks kaddressbook.control 196 ./mkipks kaddressbook.control
199 ifndef BUILD_NO_MICROMAIL 197 ifndef BUILD_NO_MICROMAIL
200 ./mkipks kopiemail.control 198 ./mkipks kopiemail.control
201 endif 199 endif
202 ./mkipks korganizer-alarm.control 200 ./mkipks korganizer-alarm.control
203 ifndef BUILD_NO_GAMMU 201 ifndef BUILD_NO_GAMMU
204 ./mkipks gammu.control 202 ./mkipks kammu.control
205 endif 203 endif
206 204
207tmake: objects \ 205tmake: objects \
208 qtcompat/Makefile$(PLATFORM) \ 206 qtcompat/Makefile$(PLATFORM) \
209 microkde/Makefile$(PLATFORM) \ 207 microkde/Makefile$(PLATFORM) \
210 libkcal/Makefile$(PLATFORM) \ 208 libkcal/Makefile$(PLATFORM) \
211 libkdepim/Makefile$(PLATFORM) \ 209 libkdepim/Makefile$(PLATFORM) \
212 korganizer/Makefile$(PLATFORM) \ 210 korganizer/Makefile$(PLATFORM) \
213 kalarmd/Makefile$(PLATFORM) \ 211 kalarmd/Makefile$(PLATFORM) \
214 libical/src/libical/Makefile$(PLATFORM) \ 212 libical/src/libical/Makefile$(PLATFORM) \
215 libical/src/libicalss/Makefile$(PLATFORM) \ 213 libical/src/libicalss/Makefile$(PLATFORM) \
216 kabc/Makefile$(PLATFORM) \ 214 kabc/Makefile$(PLATFORM) \
217 kabc/formats/binary/Makefile$(PLATFORM) \ 215 kabc/formats/binary/Makefile$(PLATFORM) \
218 kabc/plugins/file/Makefile$(PLATFORM) \ 216 kabc/plugins/file/Makefile$(PLATFORM) \
219 kabc/plugins/dir/Makefile$(PLATFORM) \ 217 kabc/plugins/dir/Makefile$(PLATFORM) \
220 kabc/plugins/ldap/Makefile$(PLATFORM) \ 218 kabc/plugins/ldap/Makefile$(PLATFORM) \
221 kabc/plugins/opie/Makefile$(PLATFORM) \ 219 kabc/plugins/opie/Makefile$(PLATFORM) \
222 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 220 kabc/plugins/qtopia/Makefile$(PLATFORM) \
223 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 221 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
224 kaddressbook/Makefile$(PLATFORM) \ 222 kaddressbook/Makefile$(PLATFORM) \
225 kmicromail/Makefile$(PLATFORM) \ 223 kmicromail/Makefile$(PLATFORM) \
226 kmicromail/libetpan/Makefile$(PLATFORM) \ 224 kmicromail/libetpan/Makefile$(PLATFORM) \
227 kmicromail/libmailwrapper/Makefile$(PLATFORM) \ 225 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
228 gammu/emb/common/Makefile$(PLATFORM) \ 226 gammu/emb/common/Makefile$(PLATFORM) \
229 gammu/emb/gammu/Makefile$(PLATFORM) \ 227 gammu/emb/gammu/Makefile$(PLATFORM) \
230 228
231 229
232 230
233 231
234qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro 232qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
235 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) 233 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM)
236 234
diff --git a/gammu.control b/kammu.control
index db52c80..db52c80 100644
--- a/gammu.control
+++ b/kammu.control
diff --git a/setQtopia b/setQtopia
index e08f13c..60778ed 100755
--- a/setQtopia
+++ b/setQtopia
@@ -1,17 +1,18 @@
1# add the following line to ~/.bashrc without leading # 1# add the following line to ~/.bashrc without leading #
2# alias cq='source /opt/Qtopia/examples/korge-1.0.9r.sharp/setQtopia' 2# alias cq='source /opt/Qtopia/examples/korge-1.0.9r.sharp/setQtopia'
3# then type in terminal cq<return> to set the variables 3# then type in terminal cq<return> to set the variables
4# for desktop version in virtual framebuffer 4# for desktop version in virtual framebuffer
5export QPEDIR=/opt/Qtopia 5export QPEDIR=/opt/Qtopia
6export OPIEDIR=/kde_dev/opie 6export OPIEDIR=/kde_dev/opie
7export BUILD_NO_OPIE_PLUGIN=1 7export BUILD_NO_OPIE_PLUGIN=1
8#export BUILD_NO_GAMMU=1
8export QTDIR=/opt/Qtopia 9export QTDIR=/opt/Qtopia
9export PATH=$QTDIR/bin:$PATH 10export PATH=$QTDIR/bin:$PATH
10export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++ 11export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-generic-g++
11export LD_LIBRARY_PATH=$QTDIR/lib:$OPIEDIR/lib:$LD_LIBRARY_PATH 12export LD_LIBRARY_PATH=$QTDIR/lib:$OPIEDIR/lib:$LD_LIBRARY_PATH
12export PLATFORM=qtopia 13export PLATFORM=qtopia
13export QTOPIALIB=-lqtopia 14export QTOPIALIB=-lqtopia
14#export RELEASE_DEBUG=release 15#export RELEASE_DEBUG=release
15export RELEASE_DEBUG=debug 16export RELEASE_DEBUG=debug
16 17
17 \ No newline at end of file 18 \ No newline at end of file
diff --git a/setZaurus b/setZaurus
index 101298d..4767716 100644
--- a/setZaurus
+++ b/setZaurus
@@ -1,17 +1,18 @@
1# copy this dir to /opt/Qtopia/examples/ 1# copy this dir to /opt/Qtopia/examples/
2# Now this file should be in the path /opt/Qtopia/examples/kdepim/setZaurus 2# Now this file should be in the path /opt/Qtopia/examples/kdepim/setZaurus
3# add the following line to ~/.bashrc without leading # 3# add the following line to ~/.bashrc without leading #
4# alias cz='source /opt/Qtopia/examples/kdepim/setZaurus' 4# alias cz='source /opt/Qtopia/examples/kdepim/setZaurus'
5# then type in terminal cz<return> to set the variables 5# then type in terminal cz<return> to set the variables
6# for cross-compiling 6# for cross-compiling
7export QPEDIR=/opt/Qtopia/sharp 7export QPEDIR=/opt/Qtopia/sharp
8export OPIEDIR=/kde_dev/opie 8export OPIEDIR=/kde_dev/opie
9#export BUILD_NO_OPIE_PLUGIN=1 9#export BUILD_NO_OPIE_PLUGIN=1
10#export BUILD_NO_SHARP_PLUGIN=1 10#export BUILD_NO_SHARP_PLUGIN=1
11#export BUILD_NO_GAMMU=1
11export QTDIR=/opt/Qtopia/sharp 12export QTDIR=/opt/Qtopia/sharp
12export PATH=$QTDIR/bin:/opt/Embedix/tools/bin:$PATH 13export PATH=$QTDIR/bin:/opt/Embedix/tools/bin:$PATH
13export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ 14export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
14export PLATFORM=zaurus 15export PLATFORM=zaurus
15export RELEASE_DEBUG=release 16export RELEASE_DEBUG=release
16export SHARPDTMSDK=/opt/dtm 17export SHARPDTMSDK=/opt/dtm
17#export RELEASE_DEBUG=debug \ No newline at end of file 18#export RELEASE_DEBUG=debug \ No newline at end of file