summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-10 12:05:29 (UTC)
committer zecke <zecke>2002-09-10 12:05:29 (UTC)
commitd10cddb3c9ce75bc90b14add14bc133737fe35aa (patch) (unidiff)
treeb6bd92e786e151588ba7c7580bac64175df184c4
parentda8e0d7e3fb2d34c22299f7281ac869a8fcccb6c (diff)
downloadopie-d10cddb3c9ce75bc90b14add14bc133737fe35aa.zip
opie-d10cddb3c9ce75bc90b14add14bc133737fe35aa.tar.gz
opie-d10cddb3c9ce75bc90b14add14bc133737fe35aa.tar.bz2
Update configure to generate qtopia/ and qtopia/private
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index df8250e..b6800dc 100755
--- a/configure
+++ b/configure
@@ -107,68 +107,71 @@ fi
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; )
139 139mkdir -p include/qtopia
140( cd include/qtopia && rm -f *.h; ln -s ../../library/*.h .; )
141mkdir -p include/qtopia/private
142( cd include/qtopia/private && rm -f *.h; ln -s ../../../library/backend/*.h .; )
140mkdir -p include/opie 143mkdir -p include/opie
141( 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; )
142( cd include/opie && ln -s ../../libsql/*.h . ) 145( cd include/opie && ln -s ../../libsql/*.h .; )
143 146
144echo Creating makefiles... 147echo Creating makefiles...
145 148
146# Set version for library directly 149# Set version for library directly
147# Version 1.5.0 right now for compat. 150# Version 1.5.0 right now for compat.
148sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v 151sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v
149mv library/library.pro-v library/library.pro 152mv library/library.pro-v library/library.pro
150 153
151if [ "$QT3" = yes ] 154if [ "$QT3" = yes ]
152then 155then
153 VCONFIG="CONFIG+=qt3" 156 VCONFIG="CONFIG+=qt3"
154else 157else
155 VCONFIG="CONFIG+=qt2" 158 VCONFIG="CONFIG+=qt2"
156fi 159fi
157 160
158if [ -f $TMAKEPATH/tmake.conf ] 161if [ -f $TMAKEPATH/tmake.conf ]
159then 162then
160 # You have tmake. We'll regenerate the file for you... 163 # You have tmake. We'll regenerate the file for you...
161 echo "Makefiles will be regenerated." 164 echo "Makefiles will be regenerated."
162fi 165fi
163 166
164H=`pwd` 167H=`pwd`
165if [ -z "$TOMAKE" ] 168if [ -z "$TOMAKE" ]
166then 169then
167 TOMAKE=`make showcomponents` 170 TOMAKE=`make showcomponents`
168fi 171fi
169 172
170for a in $TOMAKE ; do 173for a in $TOMAKE ; do
171 N=$a/Makefile 174 N=$a/Makefile
172 M=$a/Makefile.in 175 M=$a/Makefile.in
173 O=$a/Makefile.add 176 O=$a/Makefile.add
174 f=`basename $a` 177 f=`basename $a`