summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index a990539..0445aa4 100755
--- a/configure
+++ b/configure
@@ -100,97 +100,97 @@ then
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
105fi 105fi
106 106
107# Next, emit a usage message if something failed. 107# Next, emit a usage message if something failed.
108 108
109if [ "$HELP" = "yes" ]; then 109if [ "$HELP" = "yes" ]; then
110 cat <<EOF 110 cat <<EOF
111Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] 111Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...]
112 112
113The defaults (*) are usually acceptable. Here is a short explanation of 113The defaults (*) are usually acceptable. Here is a short explanation of
114each option: 114each 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)
125EOF 125EOF
126 exit 0; 126 exit 0;
127fi 127fi
128 128
129CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"` 129CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"`
130 130
131if [ -f library/custom-$CUSTOM.h ] 131if [ -f library/custom-$CUSTOM.h ]
132then 132then
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
135fi 135fi
136 136
137mkdir -p include/qpe 137mkdir -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; )
139mkdir -p include/qtopia 139mkdir -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 .; )
141mkdir -p include/qtopia/private 141mkdir -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 .; )
143mkdir -p include/opie 143mkdir -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( cd include/opie && ln -s ../../libopie/pim/*.h .; )
147( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 147( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
148 ln -s ../../libopie/$generatedHeader $generatedHeader; done ) 148 ln -sf ../../libopie/$generatedHeader $generatedHeader; done )
149 149
150echo Creating makefiles... 150echo Creating makefiles...
151 151
152# Set version for library directly 152# Set version for library directly
153# Version 1.5.0 right now for compat. 153# Version 1.5.0 right now for compat.
154sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v 154sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v
155mv library/library.pro-v library/library.pro 155mv library/library.pro-v library/library.pro
156 156
157if [ "$QT3" = yes ] 157if [ "$QT3" = yes ]
158then 158then
159 VCONFIG="CONFIG+=qt3" 159 VCONFIG="CONFIG+=qt3"
160else 160else
161 VCONFIG="CONFIG+=qt2" 161 VCONFIG="CONFIG+=qt2"
162fi 162fi
163 163
164if [ -f $TMAKEPATH/tmake.conf ] 164if [ -f $TMAKEPATH/tmake.conf ]
165then 165then
166 # You have tmake. We'll regenerate the file for you... 166 # You have tmake. We'll regenerate the file for you...
167 echo "Makefiles will be regenerated." 167 echo "Makefiles will be regenerated."
168fi 168fi
169 169
170H=`pwd` 170H=`pwd`
171if [ -z "$TOMAKE" ] 171if [ -z "$TOMAKE" ]
172then 172then
173 TOMAKE=`make showcomponents` 173 TOMAKE=`make showcomponents`
174fi 174fi
175 175
176for a in $TOMAKE ; do 176for a in $TOMAKE ; do
177 N=$a/Makefile 177 N=$a/Makefile
178 M=$a/Makefile.in 178 M=$a/Makefile.in
179 O=$a/Makefile.add 179 O=$a/Makefile.add
180 f=`basename $a` 180 f=`basename $a`
181 181
182 if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ] 182 if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ]
183 then 183 then
184 ( cd $a; 184 ( cd $a;
185 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ 185 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
186 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ 186 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
187 -t $H/qt/tmake/propagate.t $f.pro | 187 -t $H/qt/tmake/propagate.t $f.pro |
188 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; 188 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
189 ) 189 )
190 echo -n "." 190 echo -n "."
191 #echo Building $N.. 191 #echo Building $N..
192 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"` 192 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"`
193 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` 193 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
194 if [ -n "$translation" -a -n "$appname" ] 194 if [ -n "$translation" -a -n "$appname" ]
195 then 195 then
196 if [ "$appname" != "$translation" ] 196 if [ "$appname" != "$translation" ]