|
diff --git a/Vars.make b/Vars.make index 59766d1..ae54661 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -1,111 +1,118 @@ |
1 | ifndef QTDIR |
1 | ifndef QTDIR |
2 | $(error QTDIR not set) |
2 | $(error QTDIR not set) |
3 | endif |
3 | endif |
4 | |
4 | |
5 | prefix=/opt/QtPalmtop |
5 | prefix=/opt/QtPalmtop |
6 | |
6 | |
7 | ifeq ($(OPIEDIR),) |
7 | ifeq ($(OPIEDIR),) |
8 | export OPIEDIR:=$(TOPDIR) |
8 | export OPIEDIR:=$(TOPDIR) |
9 | endif |
9 | endif |
10 | ifeq ($(IPK_DIR),) |
10 | ifeq ($(IPK_DIR),) |
11 | export IPK_DIR:=$(OPIEDIR) |
11 | export IPK_DIR:=$(OPIEDIR) |
12 | endif |
12 | endif |
13 | |
13 | |
14 | ifneq ($(wildcard $(TOPDIR)/.config),) |
14 | ifneq ($(wildcard $(TOPDIR)/.config),) |
15 | include $(TOPDIR)/.config |
15 | include $(TOPDIR)/.config |
16 | endif |
16 | endif |
17 | |
17 | |
18 | ifdef CONFIG_TARGET_X86 |
18 | ifdef CONFIG_TARGET_X86 |
19 | PLATFORM=x86-linux |
19 | PLATFORM=x86-linux |
20 | endif |
20 | endif |
21 | ifdef CONFIG_TARGET_SHARP |
21 | ifdef CONFIG_TARGET_SHARP |
22 | PLATFORM=sharp-linux |
22 | PLATFORM=sharp-linux |
23 | endif |
23 | endif |
24 | ifdef CONFIG_TARGET_IPAQ |
24 | ifdef CONFIG_TARGET_IPAQ |
25 | PLATFORM=ipaq-linux |
25 | PLATFORM=ipaq-linux |
26 | endif |
26 | endif |
27 | ifdef CONFIG_TARGET_RAMSES |
27 | ifdef CONFIG_TARGET_RAMSES |
28 | PLATFORM=ramses-linux |
28 | PLATFORM=ramses-linux |
29 | endif |
29 | endif |
30 | ifdef CONFIG_TARGET_SIMPAD |
30 | ifdef CONFIG_TARGET_SIMPAD |
31 | PLATFORM=simpad-linux |
31 | PLATFORM=simpad-linux |
32 | endif |
32 | endif |
33 | |
33 | |
| |
34 | ifdef CONFIG_TARGET_YOPY |
| |
35 | PLATFORM=yopy-linux |
| |
36 | endif |
| |
37 | |
34 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
38 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
35 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
39 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
36 | |
40 | |
37 | ifeq ($(QPE_VERSION),) |
41 | ifeq ($(QPE_VERSION),) |
38 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
42 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
39 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
43 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
40 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
44 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
41 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
45 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
42 | |
46 | |
43 | ifeq ($(QPE_VERSION),..) |
47 | ifeq ($(QPE_VERSION),..) |
44 | QPE_VERSION=0.9.3 |
48 | QPE_VERSION=0.9.3 |
45 | endif |
49 | endif |
46 | endif |
50 | endif |
47 | export QPE_VERSION |
51 | export QPE_VERSION |
48 | |
52 | |
49 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
53 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
50 | ifeq ($(VERSION_CVS),) |
54 | ifeq ($(VERSION_CVS),) |
51 | VERSION_CVS:=$(shell date +%Y%m%d) |
55 | VERSION_CVS:=$(shell date +%Y%m%d) |
52 | endif |
56 | endif |
53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
57 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
54 | SUB_VERSION:=$(VERSION_CVS) |
58 | SUB_VERSION:=$(VERSION_CVS) |
55 | endif |
59 | endif |
56 | export SUB_VERSION |
60 | export SUB_VERSION |
57 | |
61 | |
58 | ifneq ($(strip $(SUB_VERSION)),) |
62 | ifneq ($(strip $(SUB_VERSION)),) |
59 | EXTRAVERSION=-$(SUB_VERSION) |
63 | EXTRAVERSION=-$(SUB_VERSION) |
60 | endif |
64 | endif |
61 | |
65 | |
62 | ifeq ($(QTE_REVISION),) |
66 | ifeq ($(QTE_REVISION),) |
63 | QTE_REVISION=5 |
67 | QTE_REVISION=5 |
64 | endif |
68 | endif |
65 | export QTE_REVISION |
69 | export QTE_REVISION |
66 | |
70 | |
67 | export DEB_VERSION=2.0 |
71 | export DEB_VERSION=2.0 |
68 | |
72 | |
69 | ifeq ($(QTE_BASEVERSION),) |
73 | ifeq ($(QTE_BASEVERSION),) |
70 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
74 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
71 | QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') |
75 | QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') |
72 | else |
76 | else |
73 | QTE_BASEVERSION=2.3.5 |
77 | QTE_BASEVERSION=2.3.5 |
74 | endif |
78 | endif |
75 | endif |
79 | endif |
76 | export QTE_BASEVERSION |
80 | export QTE_BASEVERSION |
77 | |
81 | |
78 | ifeq ($(QTE_VERSION),) |
82 | ifeq ($(QTE_VERSION),) |
79 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
83 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
80 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
84 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
81 | else |
85 | else |
82 | QTE_VERSION=2.3.5 |
86 | QTE_VERSION=2.3.5 |
83 | endif |
87 | endif |
84 | endif |
88 | endif |
85 | export QTE_VERSION |
89 | export QTE_VERSION |
86 | |
90 | |
87 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
91 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
88 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
92 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
89 | |
93 | |
90 | ifdef CONFIG_OPTIMIZATIONS |
94 | ifdef CONFIG_OPTIMIZATIONS |
91 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
95 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
92 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
96 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
93 | endif |
97 | endif |
94 | |
98 | |
95 | ifeq ($(STRIP),) |
99 | ifeq ($(STRIP),) |
96 | ifneq ($(CONFIG_TARGET_X86),) |
100 | ifneq ($(CONFIG_TARGET_X86),) |
97 | STRIP=strip |
101 | STRIP=strip |
98 | endif |
102 | endif |
99 | ifneq ($(CONFIG_TARGET_IPAQ),) |
103 | ifneq ($(CONFIG_TARGET_IPAQ),) |
100 | STRIP=arm-linux-strip |
104 | STRIP=arm-linux-strip |
101 | endif |
105 | endif |
102 | ifneq ($(CONFIG_TARGET_SHARP),) |
106 | ifneq ($(CONFIG_TARGET_SHARP),) |
103 | STRIP=arm-linux-strip |
107 | STRIP=arm-linux-strip |
104 | endif |
108 | endif |
105 | ifneq ($(CONFIG_TARGET_RAMSES),) |
109 | ifneq ($(CONFIG_TARGET_RAMSES),) |
106 | STRIP=arm-linux-strip |
110 | STRIP=arm-linux-strip |
107 | endif |
111 | endif |
108 | ifneq ($(CONFIG_TARGET_SIMPAD),) |
112 | ifneq ($(CONFIG_TARGET_SIMPAD),) |
109 | STRIP=arm-linux-strip |
113 | STRIP=arm-linux-strip |
110 | endif |
114 | endif |
| |
115 | ifneq ($(CONFIG_TARGET_YOPY),) |
| |
116 | STRIP=arm-linux-strip |
| |
117 | endif |
111 | endif |
118 | endif |
|