|
diff --git a/configure b/configure index 7db2738..9de0276 100755 --- a/ configure+++ b/ configure |
|
@@ -156,48 +156,49 @@ then |
156 | echo "Makefiles will be regenerated." |
156 | echo "Makefiles will be regenerated." |
157 | fi |
157 | fi |
158 | |
158 | |
159 | H=`pwd` |
159 | H=`pwd` |
160 | if [ -z "$TOMAKE" ] |
160 | if [ -z "$TOMAKE" ] |
161 | then |
161 | then |
162 | TOMAKE=`make showcomponents` |
162 | TOMAKE=`make showcomponents` |
163 | fi |
163 | fi |
164 | |
164 | |
165 | for a in $TOMAKE ; do |
165 | for a in $TOMAKE ; do |
166 | N=$a/Makefile |
166 | N=$a/Makefile |
167 | M=$a/Makefile.in |
167 | M=$a/Makefile.in |
168 | O=$a/Makefile.add |
168 | O=$a/Makefile.add |
169 | f=`basename $a` |
169 | f=`basename $a` |
170 | |
170 | |
171 | if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] |
171 | if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] |
172 | then |
172 | then |
173 | ( cd $a; |
173 | ( cd $a; |
174 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
174 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
175 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
175 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
176 | -t $H/qt/tmake/propagate.t $f.pro | |
176 | -t $H/qt/tmake/propagate.t $f.pro | |
177 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
177 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
178 | ) |
178 | ) |
179 | echo -n "." |
179 | echo -n "." |
| |
180 | #echo Building $N.. |
180 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
181 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
181 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
182 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
182 | if [ -n "$translation" -a -n "$appname" ] |
183 | if [ -n "$translation" -a -n "$appname" ] |
183 | then |
184 | then |
184 | if [ $appname != $translation ] |
185 | if [ $appname != $translation ] |
185 | then |
186 | then |
186 | echo |
187 | echo |
187 | echo "Warning: translation and appname disagree in $a/$f.pro" |
188 | echo "Warning: translation and appname disagree in $a/$f.pro" |
188 | fi |
189 | fi |
189 | fi |
190 | fi |
190 | |
191 | |
191 | fi |
192 | fi |
192 | |
193 | |
193 | cat > $N <<EOF |
194 | cat > $N <<EOF |
194 | ############################################################################# |
195 | ############################################################################# |
195 | # Automatically generated from $M |
196 | # Automatically generated from $M |
196 | # Build options from $1 |
197 | # Build options from $1 |
197 | ############################################################################# |
198 | ############################################################################# |
198 | |
199 | |
199 | EOF |
200 | EOF |
200 | |
201 | |
201 | SED= |
202 | SED= |
202 | PLATFORM_CFLAGS= |
203 | PLATFORM_CFLAGS= |
203 | |
204 | |
|