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