summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure2
-rw-r--r--core/opie-login/opie-login.pro17
-rw-r--r--noncore/settings/backup/backup.pro18
-rw-r--r--noncore/settings/sshkeys/sshkeys.pro17
-rw-r--r--noncore/settings/usermanager/usermanager.pro18
5 files changed, 71 insertions, 1 deletions
diff --git a/configure b/configure
index 0445aa4..b7cb702 100755
--- a/configure
+++ b/configure
@@ -191,114 +191,114 @@ for a in $TOMAKE ; do
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" ]
197 then 197 then
198 echo 198 echo
199 echo "Warning: translation and appname disagree in $a/$f.pro" 199 echo "Warning: translation and appname disagree in $a/$f.pro"
200 fi 200 fi
201 fi 201 fi
202 202
203 fi 203 fi
204 204
205 cat > $N <<EOF 205 cat > $N <<EOF
206############################################################################# 206#############################################################################
207# Automatically generated from $M 207# Automatically generated from $M
208# Build options from $1 208# Build options from $1
209############################################################################# 209#############################################################################
210 210
211EOF 211EOF
212 212
213 SED= 213 SED=
214 PLATFORM_CFLAGS= 214 PLATFORM_CFLAGS=
215 215
216 if [ "$f" = "embeddedkonsole" ] 216 if [ "$f" = "embeddedkonsole" ]
217 then 217 then
218 case $PLATFORM in 218 case $PLATFORM in
219 *x86*|*generic*|*ipaq*|*oz*|*sharp*) 219 *x86*|*generic*|*ipaq*|*oz*|*sharp*)
220 SED="$SED /^LIBS.*=/s/\$/ -lutil/;" 220 SED="$SED /^LIBS.*=/s/\$/ -lutil/;"
221 PLATFORM_CFLAGS="-DHAVE_OPENPTY" 221 PLATFORM_CFLAGS="-DHAVE_OPENPTY"
222 ;; *) 222 ;; *)
223 SED= 223 SED=
224 esac 224 esac
225 elif [ "$f" = "libmpeg3" ] 225 elif [ "$f" = "libmpeg3" ]
226 then 226 then
227 # Patch our Makefile.in file with the platform specifics for the libmpeg3 library 227 # Patch our Makefile.in file with the platform specifics for the libmpeg3 library
228 # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code) 228 # Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code)
229 SED='s/\$(CC)/\$(CXX)/;' 229 SED='s/\$(CC)/\$(CXX)/;'
230 case $PLATFORM 230 case $PLATFORM
231 in 231 in
232 # For x86 turn on using floating point, compile mmx and css code 232 # For x86 turn on using floating point, compile mmx and css code
233 *x86*) 233 *x86*)
234 # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486" 234 # "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486"
235 PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS" 235 PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS"
236 SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;" 236 SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;"
237 # For generic turn on using floating point 237 # For generic turn on using floating point
238 ;; *generic*) 238 ;; *generic*)
239 PLATFORM_CFLAGS="" 239 PLATFORM_CFLAGS=""
240 # 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
241 ;; *ipaq*|*oz*|*sharp*) 241 ;; *ipaq*|*oz*|*sharp*)
242 PLATFORM_CFLAGS="-DUSE_FIXED_POINT" 242 PLATFORM_CFLAGS="-DUSE_FIXED_POINT"
243 ;; *) 243 ;; *)
244 # For 'other platforms', turn off optimizations and use fixed point 244 # For 'other platforms', turn off optimizations and use fixed point
245 PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT" 245 PLATFORM_CFLAGS="-O -DUSE_FIXED_POINT"
246 esac 246 esac
247 elif [ "$f" = "libmad" ] 247 elif [ "$f" = "libmad" ]
248 then 248 then
249 # Patch our Makefile.in file with the platform specifics for the libmad library 249 # Patch our Makefile.in file with the platform specifics for the libmad library
250 case $PLATFORM 250 case $PLATFORM
251 in 251 in
252 # For x86 use intel optimizations 252 # For x86 use intel optimizations
253 *x86*) 253 *x86*)
254 PLATFORM_CFLAGS="-DFPM_INTEL" 254 PLATFORM_CFLAGS="-DFPM_INTEL"
255 # For the ipaq use ARM asm optimizations 255 # For the ipaq use ARM asm optimizations
256 ;; *ipaq*|*oz*|*sharp*) 256 ;; *ipaq*|*oz*|*sharp*)
257 PLATFORM_CFLAGS="-DFPM_ARM" 257 PLATFORM_CFLAGS="-DFPM_ARM"
258 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" 258 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
259 # For generic platforms use the C 64-bit implementation 259 # For generic platforms use the C 64-bit implementation
260 ;; *generic*) 260 ;; *generic*)
261 PLATFORM_CFLAGS="-DFPM_64BIT" 261 PLATFORM_CFLAGS="-DFPM_64BIT"
262 # For 'other platforms' use the ARM code 262 # For 'other platforms' use the ARM code
263 ;; *) 263 ;; *)
264 PLATFORM_CFLAGS="-DFPM_ARM" 264 PLATFORM_CFLAGS="-DFPM_ARM"
265 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;" 265 SED="$SED /SOURCES.*=/s/=/= idmt_arm.S /;"
266 esac 266 esac
267 fi 267 fi
268 SED="$SED /LFLAGS.*=.*/s/\$/ $EXTRA $EXTRALIBS/;" 268 SED="$SED /LFLAGS.*=.*/s/\$/ $EXTRA $EXTRALIBS/;"
269 PLATFORM_CFLAGS="$PLATFORM_CFLAGS $EXTRAFLAGS"; 269 PLATFORM_CFLAGS="$PLATFORM_CFLAGS $EXTRAFLAGS";
270 if [ -n "$PLATFORM_CFLAGS" ] 270 if [ -n "$PLATFORM_CFLAGS" ]
271 then 271 then
272 # Append the addition c-flags we have defined 272 # Append the addition c-flags we have defined
273 SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;" 273 SED="$SED /CFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS/;"
274 SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS -fpermissive/;" 274 SED="$SED /CXXFLAGS.*=.*/s/\$/ $PLATFORM_CFLAGS -fpermissive/;"
275 fi 275 fi
276 cat $TARGET >> $N 276 cat $TARGET >> $N
277 if [ -n "$SED" ] 277 if [ -n "$SED" ]
278 then 278 then
279 sed -e "$SED" $M >> $N 279 sed -e "$SED" $M >> $N
280 else 280 else
281 cat $M >> $N 281 cat $M >> $N
282 fi 282 fi
283 283
284 cat >> $N <<EOF 284 cat >> $N <<EOF
285 285
286lupdate: 286lupdate:
287 lupdate $f.pro 287 lupdate -noobsolete $f.pro
288 288
289lrelease: 289lrelease:
290 lrelease $f.pro 290 lrelease $f.pro
291 291
292EOF 292EOF
293 if [ -f "$O" ] 293 if [ -f "$O" ]
294 then 294 then
295 cat >> $N $O 295 cat >> $N $O
296 fi 296 fi
297 297
298done 298done
299 299
300MAKE=make 300MAKE=make
301echo 301echo
302echo "Opie is now configured for building. Just run $MAKE (or $MAKE single)." 302echo "Opie is now configured for building. Just run $MAKE (or $MAKE single)."
303echo "To reconfigure, run $MAKE clean and configure." 303echo "To reconfigure, run $MAKE clean and configure."
304echo 304echo
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index 45b9a7a..7d8ecb1 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -1,27 +1,44 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on debug usepam 2CONFIG = qt warn_on debug usepam
3 3
4HEADERS = loginwindowimpl.h \ 4HEADERS = loginwindowimpl.h \
5 loginapplication.h \ 5 loginapplication.h \
6 ../launcher/inputmethods.h \ 6 ../launcher/inputmethods.h \
7 ../apps/calibrate/calibrate.h 7 ../apps/calibrate/calibrate.h
8 8
9SOURCES = loginwindowimpl.cpp \ 9SOURCES = loginwindowimpl.cpp \
10 loginapplication.cpp \ 10 loginapplication.cpp \
11 ../launcher/inputmethods.cpp \ 11 ../launcher/inputmethods.cpp \
12 ../apps/calibrate/calibrate.cpp \ 12 ../apps/calibrate/calibrate.cpp \
13 main.cpp 13 main.cpp
14 14
15INTERFACES = loginwindow.ui 15INTERFACES = loginwindow.ui
16 16
17INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 17INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
18DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 18DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
19 19
20LIBS += -lqpe -lopie 20LIBS += -lqpe -lopie
21 21
22usepam:LIBS += -lpam 22usepam:LIBS += -lpam
23usepam:DEFINES += USEPAM 23usepam:DEFINES += USEPAM
24 24
25DESTDIR = $(OPIEDIR)/bin 25DESTDIR = $(OPIEDIR)/bin
26TARGET = opie-login 26TARGET = opie-login
27 27
28TRANSLATIONS = ../../i18n/de/opie-login.ts \
29· ../../i18n/en/opie-login.ts \
30· ../../i18n/es/opie-login.ts \
31· ../../i18n/fr/opie-login.ts \
32· ../../i18n/hu/opie-login.ts \
33· ../../i18n/ja/opie-login.ts \
34· ../../i18n/ko/opie-login.ts \
35· ../../i18n/no/opie-login.ts \
36· ../../i18n/pl/opie-login.ts \
37· ../../i18n/pt/opie-login.ts \
38· ../../i18n/pt_BR/opie-login.ts \
39· ../../i18n/sl/opie-login.ts \
40· ../../i18n/zh_CN/opie-login.ts \
41· ../../i18n/zh_TW/opie-login.ts \
42· ../../i18n/it/opie-login.ts \
43· ../../i18n/da/opie-login.ts
44
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro
index 8259195..064d6e4 100644
--- a/noncore/settings/backup/backup.pro
+++ b/noncore/settings/backup/backup.pro
@@ -1,11 +1,29 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = backuprestore.h 4 HEADERS = backuprestore.h
5 SOURCES = main.cpp backuprestore.cpp 5 SOURCES = main.cpp backuprestore.cpp
6 INCLUDEPATH+= $(OPIEDIR)/include 6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe 8LIBS += -lqpe
9 INTERFACES= backuprestorebase.ui 9 INTERFACES= backuprestorebase.ui
10 TARGET = backup 10 TARGET = backup
11 DESTDIR = $(OPIEDIR)/bin 11 DESTDIR = $(OPIEDIR)/bin
12
13TRANSLATIONS = ../../../i18n/de/backup.ts \
14· ../../../i18n/en/backup.ts \
15· ../../../i18n/es/backup.ts \
16· ../../../i18n/fr/backup.ts \
17· ../../../i18n/hu/backup.ts \
18· ../../../i18n/ja/backup.ts \
19· ../../../i18n/ko/backup.ts \
20· ../../../i18n/no/backup.ts \
21· ../../../i18n/pl/backup.ts \
22· ../../../i18n/pt/backup.ts \
23· ../../../i18n/pt_BR/backup.ts \
24· ../../../i18n/sl/backup.ts \
25· ../../../i18n/zh_CN/backup.ts \
26· ../../../i18n/zh_TW/backup.ts \
27 · ../../../i18n/it/backup.ts \
28 · ../../../i18n/da/backup.ts
29
diff --git a/noncore/settings/sshkeys/sshkeys.pro b/noncore/settings/sshkeys/sshkeys.pro
index 33155e3..af2cc60 100644
--- a/noncore/settings/sshkeys/sshkeys.pro
+++ b/noncore/settings/sshkeys/sshkeys.pro
@@ -1,11 +1,28 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3HEADERS = sshkeys.h 3HEADERS = sshkeys.h
4SOURCES = main.cpp sshkeys.cpp 4SOURCES = main.cpp sshkeys.cpp
5TARGET = sshkeys 5TARGET = sshkeys
6INTERFACES = sshkeysbase.ui 6INTERFACES = sshkeysbase.ui
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe -lopie 9LIBS += -lqpe -lopie
10DESTDIR = $(OPIEDIR)/bin 10DESTDIR = $(OPIEDIR)/bin
11 11
12TRANSLATIONS = ../../../i18n/de/sshkeys.ts \
13· ../../../i18n/en/sshkeys.ts \
14· ../../../i18n/es/sshkeys.ts \
15· ../../../i18n/fr/sshkeys.ts \
16· ../../../i18n/hu/sshkeys.ts \
17· ../../../i18n/ja/sshkeys.ts \
18· ../../../i18n/ko/sshkeys.ts \
19· ../../../i18n/no/sshkeys.ts \
20· ../../../i18n/pl/sshkeys.ts \
21· ../../../i18n/pt/sshkeys.ts \
22· ../../../i18n/pt_BR/sshkeys.ts \
23· ../../../i18n/sl/sshkeys.ts \
24· ../../../i18n/zh_CN/sshkeys.ts \
25· ../../../i18n/zh_TW/sshkeys.ts \
26 ../../../i18n/it/sshkeys.ts \
27 ../../../i18n/da/sshkeys.ts
28
diff --git a/noncore/settings/usermanager/usermanager.pro b/noncore/settings/usermanager/usermanager.pro
index 2f3212f..06bb4a8 100644
--- a/noncore/settings/usermanager/usermanager.pro
+++ b/noncore/settings/usermanager/usermanager.pro
@@ -1,10 +1,28 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h 4 HEADERS = usermanager.h userdialog.h groupdialog.h passwd.h
5 SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.h main.cpp 5 SOURCES = usermanager.cpp userdialog.cpp groupdialog.cpp passwd.h main.cpp
6 INCLUDEPATH+= $(OPIEDIR)/include 6 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe -lopie -lcrypt 8LIBS += -lqpe -lopie -lcrypt
9 TARGET = usermanager 9 TARGET = usermanager
10DESTDIR = $(OPIEDIR)/bin 10DESTDIR = $(OPIEDIR)/bin
11
12TRANSLATIONS = ../../../i18n/de/usermanager.ts \
13· ../../../i18n/en/usermanager.ts \
14· ../../../i18n/es/usermanager.ts \
15· ../../../i18n/fr/usermanager.ts \
16· ../../../i18n/hu/usermanager.ts \
17· ../../../i18n/ja/usermanager.ts \
18· ../../../i18n/ko/usermanager.ts \
19· ../../../i18n/no/usermanager.ts \
20· ../../../i18n/pl/usermanager.ts \
21· ../../../i18n/pt/usermanager.ts \
22· ../../../i18n/pt_BR/usermanager.ts \
23· ../../../i18n/sl/usermanager.ts \
24· ../../../i18n/zh_CN/usermanager.ts \
25· ../../../i18n/zh_TW/usermanager.ts \
26 · ../../../i18n/it/usermanager.ts \
27 ../../../i18n/da/usermanager.ts
28