|
diff --git a/configure b/configure index b6800dc..7949bf4 100755 --- a/ configure+++ b/ configure |
|
@@ -98,96 +98,97 @@ then |
98 | PLATFORM=linux-$PLATFORM-g++ |
98 | PLATFORM=linux-$PLATFORM-g++ |
99 | else |
99 | else |
100 | echo |
100 | echo |
101 | echo ' The specified platform/compiler not supported: ' $TARGET |
101 | echo ' The specified platform/compiler not supported: ' $TARGET |
102 | echo |
102 | echo |
103 | exit 2 |
103 | exit 2 |
104 | fi |
104 | fi |
105 | fi |
105 | fi |
106 | |
106 | |
107 | # Next, emit a usage message if something failed. |
107 | # Next, emit a usage message if something failed. |
108 | |
108 | |
109 | if [ "$HELP" = "yes" ]; then |
109 | if [ "$HELP" = "yes" ]; then |
110 | cat <<EOF |
110 | cat <<EOF |
111 | Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] |
111 | Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] |
112 | |
112 | |
113 | The defaults (*) are usually acceptable. Here is a short explanation of |
113 | The defaults (*) are usually acceptable. Here is a short explanation of |
114 | each option: |
114 | each option: |
115 | |
115 | |
116 | * -release ........... Compile and link Qt with debugging turned off. |
116 | * -release ........... Compile and link Qt with debugging turned off. |
117 | -debug ............. Compile and link Qt with debugging turned on. |
117 | -debug ............. Compile and link Qt with debugging turned on. |
118 | |
118 | |
119 | * -shared ............ Create and use a shared Qt library (libqt.so) |
119 | * -shared ............ Create and use a shared Qt library (libqt.so) |
120 | -static ............ Create and use a static Qt library (libqt.a) |
120 | -static ............ Create and use a static Qt library (libqt.a) |
121 | |
121 | |
122 | -qt3 ............... Configure for use with Qt 3.x |
122 | -qt3 ............... Configure for use with Qt 3.x |
123 | |
123 | |
124 | -platform target ... The platform you are building on ($PLATFORM) |
124 | -platform target ... The platform you are building on ($PLATFORM) |
125 | EOF |
125 | EOF |
126 | exit 0; |
126 | exit 0; |
127 | fi |
127 | fi |
128 | |
128 | |
129 | CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"` |
129 | CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"` |
130 | |
130 | |
131 | if [ -f library/custom-$CUSTOM.h ] |
131 | if [ -f library/custom-$CUSTOM.h ] |
132 | then |
132 | then |
133 | rm -f library/custom.h |
133 | rm -f library/custom.h |
134 | ln -s custom-$CUSTOM.h library/custom.h |
134 | ln -s custom-$CUSTOM.h library/custom.h |
135 | fi |
135 | fi |
136 | |
136 | |
137 | mkdir -p include/qpe |
137 | mkdir -p include/qpe |
138 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
138 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
139 | mkdir -p include/qtopia |
139 | mkdir -p include/qtopia |
140 | ( cd include/qtopia && rm -f *.h; ln -s ../../library/*.h .; ) |
140 | ( cd include/qtopia && rm -f *.h; ln -s ../../library/*.h .; ) |
141 | mkdir -p include/qtopia/private |
141 | mkdir -p include/qtopia/private |
142 | ( cd include/qtopia/private && rm -f *.h; ln -s ../../../library/backend/*.h .; ) |
142 | ( cd include/qtopia/private && rm -f *.h; ln -s ../../../library/backend/*.h .; ) |
143 | mkdir -p include/opie |
143 | mkdir -p include/opie |
144 | ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) |
144 | ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) |
145 | ( cd include/opie && ln -s ../../libsql/*.h .; ) |
145 | ( cd include/opie && ln -s ../../libsql/*.h .; ) |
| |
146 | ( cd include/opie && ln -s ../../libopie/pim/*.h .; ) |
146 | |
147 | |
147 | echo Creating makefiles... |
148 | echo Creating makefiles... |
148 | |
149 | |
149 | # Set version for library directly |
150 | # Set version for library directly |
150 | # Version 1.5.0 right now for compat. |
151 | # Version 1.5.0 right now for compat. |
151 | sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
152 | sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
152 | mv library/library.pro-v library/library.pro |
153 | mv library/library.pro-v library/library.pro |
153 | |
154 | |
154 | if [ "$QT3" = yes ] |
155 | if [ "$QT3" = yes ] |
155 | then |
156 | then |
156 | VCONFIG="CONFIG+=qt3" |
157 | VCONFIG="CONFIG+=qt3" |
157 | else |
158 | else |
158 | VCONFIG="CONFIG+=qt2" |
159 | VCONFIG="CONFIG+=qt2" |
159 | fi |
160 | fi |
160 | |
161 | |
161 | if [ -f $TMAKEPATH/tmake.conf ] |
162 | if [ -f $TMAKEPATH/tmake.conf ] |
162 | then |
163 | then |
163 | # You have tmake. We'll regenerate the file for you... |
164 | # You have tmake. We'll regenerate the file for you... |
164 | echo "Makefiles will be regenerated." |
165 | echo "Makefiles will be regenerated." |
165 | fi |
166 | fi |
166 | |
167 | |
167 | H=`pwd` |
168 | H=`pwd` |
168 | if [ -z "$TOMAKE" ] |
169 | if [ -z "$TOMAKE" ] |
169 | then |
170 | then |
170 | TOMAKE=`make showcomponents` |
171 | TOMAKE=`make showcomponents` |
171 | fi |
172 | fi |
172 | |
173 | |
173 | for a in $TOMAKE ; do |
174 | for a in $TOMAKE ; do |
174 | N=$a/Makefile |
175 | N=$a/Makefile |
175 | M=$a/Makefile.in |
176 | M=$a/Makefile.in |
176 | O=$a/Makefile.add |
177 | O=$a/Makefile.add |
177 | f=`basename $a` |
178 | f=`basename $a` |
178 | |
179 | |
179 | if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ] |
180 | if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ] |
180 | then |
181 | then |
181 | ( cd $a; |
182 | ( cd $a; |
182 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
183 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
183 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
184 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
184 | -t $H/qt/tmake/propagate.t $f.pro | |
185 | -t $H/qt/tmake/propagate.t $f.pro | |
185 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
186 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
186 | ) |
187 | ) |
187 | echo -n "." |
188 | echo -n "." |
188 | #echo Building $N.. |
189 | #echo Building $N.. |
189 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"` |
190 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"` |
190 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
191 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
191 | if [ -n "$translation" -a -n "$appname" ] |
192 | if [ -n "$translation" -a -n "$appname" ] |
192 | then |
193 | then |
193 | if [ "$appname" != "$translation" ] |
194 | if [ "$appname" != "$translation" ] |
|