summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-01 22:18:04 (UTC)
committer kergoth <kergoth>2002-11-01 22:18:04 (UTC)
commitefbd14a8c566c7ed1c87068543ad7867519eeea1 (patch) (unidiff)
treec9335aa5739d44fa612fef0298f4e6e3a25c6130
parent438b8c09d5d18756f19bfa6043ad480a70e9267c (diff)
downloadopie-efbd14a8c566c7ed1c87068543ad7867519eeea1.zip
opie-efbd14a8c566c7ed1c87068543ad7867519eeea1.tar.gz
opie-efbd14a8c566c7ed1c87068543ad7867519eeea1.tar.bz2
Applied tronical's patch to correct linking on generated headers in libopie.
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure12
1 files changed, 8 insertions, 4 deletions
diff --git a/configure b/configure
index 7949bf4..a990539 100755
--- a/configure
+++ b/configure
@@ -144,6 +144,8 @@ 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( 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 \
148 ln -s ../../libopie/$generatedHeader $generatedHeader; done )
147 149
148echo Creating makefiles... 150echo Creating makefiles...
149 151
@@ -214,7 +216,7 @@ EOF
214 if [ "$f" = "embeddedkonsole" ] 216 if [ "$f" = "embeddedkonsole" ]
215 then 217 then
216 case $PLATFORM in 218 case $PLATFORM in
217 *x86*|*generic*|*ipaq*|*sharp*) 219 *x86*|*generic*|*ipaq*|*oz*|*sharp*)
218 SED="$SED /^LIBS.*=/s/\$/ -lutil/;" 220 SED="$SED /^LIBS.*=/s/\$/ -lutil/;"
219 PLATFORM_CFLAGS="-DHAVE_OPENPTY" 221 PLATFORM_CFLAGS="-DHAVE_OPENPTY"
220 ;; *) 222 ;; *)
@@ -236,7 +238,7 @@ EOF
236 ;; *generic*) 238 ;; *generic*)
237 PLATFORM_CFLAGS="" 239 PLATFORM_CFLAGS=""
238 # For the ipaq use fixed point maths, don't compile the mmx or css code 240 # For the ipaq use fixed point maths, don't compile the mmx or css code
239 ;; *ipaq*|*sharp*) 241 ;; *ipaq*|*oz*|*sharp*)
240 PLATFORM_CFLAGS="-DUSE_FIXED_POINT" 242 PLATFORM_CFLAGS="-DUSE_FIXED_POINT"
241 ;; *) 243 ;; *)
242 # For 'other platforms', turn off optimizations and use fixed point 244 # For 'other platforms', turn off optimizations and use fixed point
@@ -251,7 +253,7 @@ EOF
251 *x86*) 253 *x86*)
252 PLATFORM_CFLAGS="-DFPM_INTEL" 254 PLATFORM_CFLAGS="-DFPM_INTEL"
253 # For the ipaq use ARM asm optimizations 255 # For the ipaq use ARM asm optimizations
254 ;; *ipaq*|*sharp*) 256 ;; *ipaq*|*oz*|*sharp*)
255 PLATFORM_CFLAGS="-DFPM_ARM" 257 PLATFORM_CFLAGS="-DFPM_ARM"
256 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" 258 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
257 # For generic platforms use the C 64-bit implementation 259 # For generic platforms use the C 64-bit implementation
@@ -263,11 +265,13 @@ EOF
263 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" 265 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
264 esac 266 esac
265 fi 267 fi
268 SED="$SED /LFLAGS.*=.*/s/\$/ $EXTRA $EXTRALIBS/;"
269 PLATFORM_CFLAGS="$PLATFORM_CFLAGS $EXTRAFLAGS";
266 if [ -n "$PLATFORM_CFLAGS" ] 270 if [ -n "$PLATFORM_CFLAGS" ]
267 then 271 then
268 # Append the addition c-flags we have defined 272 # Append the addition c-flags we have defined
269 SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" 273 SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;"
270 SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" 274 SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS -fpermissive/;"
271 fi 275 fi
272 cat $TARGET >> $N 276 cat $TARGET >> $N
273 if [ -n "$SED" ] 277 if [ -n "$SED" ]