summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-13 15:06:42 (UTC)
committer zautrix <zautrix>2004-10-13 15:06:42 (UTC)
commitb0d2913f378c6c3a8d9795a5daa5bdcdf17a75b3 (patch) (unidiff)
treed065dbea5244040fbeaa9d15fb8fbba3a27f2a25
parent2cfda2af7cba3c9aff2d7722421b5d33b7f56cb6 (diff)
downloadkdepimpi-b0d2913f378c6c3a8d9795a5daa5bdcdf17a75b3.zip
kdepimpi-b0d2913f378c6c3a8d9795a5daa5bdcdf17a75b3.tar.gz
kdepimpi-b0d2913f378c6c3a8d9795a5daa5bdcdf17a75b3.tar.bz2
makefile fixes for compilation with gcc32
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile10
-rw-r--r--Makefile.Embedded10
-rw-r--r--kmicromail/kmicromailE.pro2
-rwxr-xr-xsetZaurus31
4 files changed, 21 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0b8997e..6a8521f 100644
--- a/Makefile
+++ b/Makefile
@@ -71,29 +71,33 @@ all: build_microkde \
71 71
72 72
73build_microkde: variable_test tmake 73build_microkde: variable_test tmake
74 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 74 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
75 make -f Makefile$(PLATFORM) || exit 1; popd; \ 75 make -f Makefile$(PLATFORM) || exit 1; popd; \
76 done 76 done
77 77
78build_qtopia_plugin: build_microkde 78build_qtopia_plugin: build_microkde
79 ifdef BUILD_NO_QTOPIA_PLUGIN
80 @echo == qtopia plugin not build.
81 else
79 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 82 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
80 make -f Makefile$(PLATFORM) || exit 1; popd; \ 83 make -f Makefile$(PLATFORM) || exit 1; popd; \
81 done 84 done
85 endif
82 86
83build_opie_plugin: build_microkde 87build_opie_plugin: build_microkde
84 ifdef BUILD_NO_OPIE_PLUGIN 88 ifdef BUILD_NO_OPIE_PLUGIN
85 @echo == opie plugin not build. 89 @echo == opie plugin not build.
86 else 90 else
87 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 91 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
88 make -f Makefile$(PLATFORM) || exit 1; popd; \ 92 make -f Makefile$(PLATFORM) || exit 1; popd; \
89 done 93 done
90 endif 94 endif
91 95
92build_sharp_plugin: build_microkde 96build_sharp_plugin: build_microkde
93 ifdef BUILD_NO_SHARP_PLUGIN 97 ifdef BUILD_NO_SHARP_PLUGIN
94 @echo == ldap plugin not build. 98 @echo == ldap plugin not build.
95 else 99 else
96 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ 100 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
97 make -f Makefile$(PLATFORM) || exit 1; popd; \ 101 make -f Makefile$(PLATFORM) || exit 1; popd; \
98 done 102 done
99 endif 103 endif
@@ -143,16 +147,17 @@ variable_info:
143 @echo QTDIR=$(QTDIR) 147 @echo QTDIR=$(QTDIR)
144 @echo QPEDIR=$(QPEDIR) 148 @echo QPEDIR=$(QPEDIR)
145 @echo OPIEDIR=$(OPIEDIR) 149 @echo OPIEDIR=$(OPIEDIR)
146 @echo PLATFORM=$(PLATFORM) 150 @echo PLATFORM=$(PLATFORM)
147 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 151 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
148 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 152 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
149 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 153 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
150 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 154 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
155 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
151 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 156 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
152 ifndef BUILD_NO_SHARP_PLUGIN 157 ifndef BUILD_NO_SHARP_PLUGIN
153 @echo SHARPDTMSDK=$(SHARPDTMSDK) 158 @echo SHARPDTMSDK=$(SHARPDTMSDK)
154 endif 159 endif
155 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 160 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
156 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 161 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
157 @echo -------------------------------------- 162 @echo --------------------------------------
158 163
@@ -167,16 +172,19 @@ variable_test: variable_info
167 $(error PLATFORM is not defined) 172 $(error PLATFORM is not defined)
168 endif 173 endif
169 ifdef BUILD_NO_LDAP_PLUGIN 174 ifdef BUILD_NO_LDAP_PLUGIN
170 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 175 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
171 endif 176 endif
172 ifdef BUILD_NO_OPIE_PLUGIN 177 ifdef BUILD_NO_OPIE_PLUGIN
173 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 178 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
174 endif 179 endif
180 ifdef BUILD_NO_QTOPIA_PLUGIN
181 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
182 endif
175 ifdef BUILD_NO_MICROMAIL 183 ifdef BUILD_NO_MICROMAIL
176 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 184 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
177 endif 185 endif
178 ifdef BUILD_NO_SHARP_PLUGIN 186 ifdef BUILD_NO_SHARP_PLUGIN
179 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 187 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
180 else 188 else
181 ifndef SHARPDTMSDK 189 ifndef SHARPDTMSDK
182 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 190 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 0b8997e..6a8521f 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -71,29 +71,33 @@ all: build_microkde \
71 71
72 72
73build_microkde: variable_test tmake 73build_microkde: variable_test tmake
74 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ 74 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
75 make -f Makefile$(PLATFORM) || exit 1; popd; \ 75 make -f Makefile$(PLATFORM) || exit 1; popd; \
76 done 76 done
77 77
78build_qtopia_plugin: build_microkde 78build_qtopia_plugin: build_microkde
79 ifdef BUILD_NO_QTOPIA_PLUGIN
80 @echo == qtopia plugin not build.
81 else
79 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ 82 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
80 make -f Makefile$(PLATFORM) || exit 1; popd; \ 83 make -f Makefile$(PLATFORM) || exit 1; popd; \
81 done 84 done
85 endif
82 86
83build_opie_plugin: build_microkde 87build_opie_plugin: build_microkde
84 ifdef BUILD_NO_OPIE_PLUGIN 88 ifdef BUILD_NO_OPIE_PLUGIN
85 @echo == opie plugin not build. 89 @echo == opie plugin not build.
86 else 90 else
87 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ 91 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
88 make -f Makefile$(PLATFORM) || exit 1; popd; \ 92 make -f Makefile$(PLATFORM) || exit 1; popd; \
89 done 93 done
90 endif 94 endif
91 95
92build_sharp_plugin: build_microkde 96build_sharp_plugin: build_microkde
93 ifdef BUILD_NO_SHARP_PLUGIN 97 ifdef BUILD_NO_SHARP_PLUGIN
94 @echo == ldap plugin not build. 98 @echo == ldap plugin not build.
95 else 99 else
96 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ 100 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
97 make -f Makefile$(PLATFORM) || exit 1; popd; \ 101 make -f Makefile$(PLATFORM) || exit 1; popd; \
98 done 102 done
99 endif 103 endif
@@ -143,16 +147,17 @@ variable_info:
143 @echo QTDIR=$(QTDIR) 147 @echo QTDIR=$(QTDIR)
144 @echo QPEDIR=$(QPEDIR) 148 @echo QPEDIR=$(QPEDIR)
145 @echo OPIEDIR=$(OPIEDIR) 149 @echo OPIEDIR=$(OPIEDIR)
146 @echo PLATFORM=$(PLATFORM) 150 @echo PLATFORM=$(PLATFORM)
147 @echo RELEASE_DEBUG=$(RELEASE_DEBUG) 151 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
148 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) 152 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
149 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) 153 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
150 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) 154 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
155 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
151 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) 156 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
152 ifndef BUILD_NO_SHARP_PLUGIN 157 ifndef BUILD_NO_SHARP_PLUGIN
153 @echo SHARPDTMSDK=$(SHARPDTMSDK) 158 @echo SHARPDTMSDK=$(SHARPDTMSDK)
154 endif 159 endif
155 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) 160 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
156 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) 161 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
157 @echo -------------------------------------- 162 @echo --------------------------------------
158 163
@@ -167,16 +172,19 @@ variable_test: variable_info
167 $(error PLATFORM is not defined) 172 $(error PLATFORM is not defined)
168 endif 173 endif
169 ifdef BUILD_NO_LDAP_PLUGIN 174 ifdef BUILD_NO_LDAP_PLUGIN
170 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) 175 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
171 endif 176 endif
172 ifdef BUILD_NO_OPIE_PLUGIN 177 ifdef BUILD_NO_OPIE_PLUGIN
173 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) 178 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
174 endif 179 endif
180 ifdef BUILD_NO_QTOPIA_PLUGIN
181 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
182 endif
175 ifdef BUILD_NO_MICROMAIL 183 ifdef BUILD_NO_MICROMAIL
176 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) 184 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
177 endif 185 endif
178 ifdef BUILD_NO_SHARP_PLUGIN 186 ifdef BUILD_NO_SHARP_PLUGIN
179 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) 187 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
180 else 188 else
181 ifndef SHARPDTMSDK 189 ifndef SHARPDTMSDK
182 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) 190 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 75ba92f..d578a9c 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -56,15 +56,17 @@ INTERFACES = editaccountsui.ui \
56 56
57INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include 57INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
58LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicroqtcompat -lmicrokdepim 58LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicroqtcompat -lmicrokdepim
59LIBS += $(QTOPIALIB) 59LIBS += $(QTOPIALIB)
60#LIBS += -lqtopia 60#LIBS += -lqtopia
61#next line for Zaurus only 61#next line for Zaurus only
62#LIBS += -luuid 62#LIBS += -luuid
63 63
64LIBS += $(GCC3EXTRALIB1)
65LIBS += $(GCC3EXTRALIB2)
64# 66#
65OBJECTS_DIR = obj/$(PLATFORM) 67OBJECTS_DIR = obj/$(PLATFORM)
66MOC_DIR = moc/$(PLATFORM) 68MOC_DIR = moc/$(PLATFORM)
67DESTDIR=$(QPEDIR)/bin 69DESTDIR=$(QPEDIR)/bin
68TARGET = ompi 70TARGET = ompi
69 71
70 72
diff --git a/setZaurus3 b/setZaurus3
index 2649292..5d1fe7b 100755
--- a/setZaurus3
+++ b/setZaurus3
@@ -5,16 +5,17 @@
5# alias cz='source /opt/Qtopia/examples/kdepim/setZaurus3' 5# alias cz='source /opt/Qtopia/examples/kdepim/setZaurus3'
6# then type in terminal cz3<return> to set the variables 6# then type in terminal cz3<return> to set the variables
7# for cross-compiling 7# for cross-compiling
8export QPEDIR=/opt/Qtopia/sharp3 8export QPEDIR=/opt/Qtopia/sharp3
9export OPIEDIR=/kde_dev/opie 9export OPIEDIR=/kde_dev/opie
10#export BUILD_NO_OPIE_PLUGIN=1 10#export BUILD_NO_OPIE_PLUGIN=1
11export BUILD_NO_QTOPIA_PLUGIN=1 11export BUILD_NO_QTOPIA_PLUGIN=1
12export BUILD_NO_SHARP_PLUGIN=1 12export BUILD_NO_SHARP_PLUGIN=1
13export BUILD_NO_LDAP_PLUGIN=1
13#export BUILD_NO_GAMMU=1 14#export BUILD_NO_GAMMU=1
14export QTDIR=/opt/Qtopia/sharp3 15export QTDIR=/opt/Qtopia/sharp3
15#insert here path to your gcc 3.3.2 compiler 16#insert here path to your gcc 3.3.2 compiler
16export PATH=$QTDIR/bin:/opt/cross/bin:$PATH 17export PATH=$QTDIR/bin:/opt/cross/bin:$PATH
17export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++ 18export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
18export PLATFORM=zaurus3 19export PLATFORM=zaurus3
19export RELEASE_DEBUG=release 20export RELEASE_DEBUG=release
20export SHARPDTMSDK=/opt/dtm 21export SHARPDTMSDK=/opt/dtm