|
diff --git a/Vars.make b/Vars.make index b99da70..457f867 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -1,138 +1,141 @@ |
1 | prefix=/opt/QtPalmtop |
1 | prefix=/opt/QtPalmtop |
2 | |
2 | |
3 | ifeq ($(OPIEDIR),) |
3 | ifeq ($(OPIEDIR),) |
4 | export OPIEDIR:=$(TOPDIR) |
4 | export OPIEDIR:=$(TOPDIR) |
5 | endif |
5 | endif |
6 | ifeq ($(IPK_DIR),) |
6 | ifeq ($(IPK_DIR),) |
7 | export IPK_DIR:=$(OPIEDIR) |
7 | export IPK_DIR:=$(OPIEDIR) |
8 | endif |
8 | endif |
9 | |
9 | |
10 | ifneq ($(wildcard $(TOPDIR)/.config),) |
10 | ifneq ($(wildcard $(TOPDIR)/.config),) |
11 | include $(TOPDIR)/.config |
11 | include $(TOPDIR)/.config |
12 | endif |
12 | endif |
13 | |
13 | |
14 | ifndef CONFIG_TARGET_OE |
14 | ifndef CONFIG_TARGET_OE |
15 | ifndef QTDIR |
15 | ifndef QTDIR |
16 | $(error QTDIR not set) |
16 | $(error QTDIR not set) |
17 | endif |
17 | endif |
18 | else |
18 | else |
19 | OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g') |
19 | OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g') |
20 | OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g') |
20 | OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g') |
21 | OETARGETSYS:=$(shell echo $(CONFIG_OE_TARGET_SYS) | sed -e's/"//g') |
21 | OETARGETSYS:=$(shell echo $(CONFIG_OE_TARGET_SYS) | sed -e's/"//g') |
22 | QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/$(OETARGETSYS)/qt2 |
22 | QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/$(OETARGETSYS)/qt2 |
23 | $(shell mkdir -p $(QTDIR)/src/moc) |
23 | $(shell mkdir -p $(QTDIR)/src/moc) |
24 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) |
24 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) |
25 | PLATFORM=sharp-linux |
25 | PLATFORM=sharp-linux |
26 | endif |
26 | endif |
27 | |
27 | |
28 | ifdef CONFIG_TARGET_X86 |
28 | ifdef CONFIG_TARGET_X86 |
29 | PLATFORM=x86-linux |
29 | PLATFORM=x86-linux |
30 | endif |
30 | endif |
31 | ifdef CONFIG_TARGET_64BIT |
31 | ifdef CONFIG_TARGET_64BIT |
32 | PLATFORM=64bit-linux |
32 | PLATFORM=64bit-linux |
33 | endif |
33 | endif |
34 | ifdef CONFIG_TARGET_SHARP |
34 | ifdef CONFIG_TARGET_SHARP |
35 | PLATFORM=sharp-linux |
35 | PLATFORM=sharp-linux |
36 | endif |
36 | endif |
37 | ifdef CONFIG_TARGET_IPAQ |
37 | ifdef CONFIG_TARGET_IPAQ |
38 | PLATFORM=ipaq-linux |
38 | PLATFORM=ipaq-linux |
39 | endif |
39 | endif |
40 | ifdef CONFIG_TARGET_RAMSES |
40 | ifdef CONFIG_TARGET_RAMSES |
41 | PLATFORM=ramses-linux |
41 | PLATFORM=ramses-linux |
42 | endif |
42 | endif |
43 | ifdef CONFIG_TARGET_SIMPAD |
43 | ifdef CONFIG_TARGET_SIMPAD |
44 | PLATFORM=simpad-linux |
44 | PLATFORM=simpad-linux |
45 | endif |
45 | endif |
46 | |
46 | |
47 | ifdef CONFIG_TARGET_YOPY |
47 | ifdef CONFIG_TARGET_YOPY |
48 | PLATFORM=yopy-linux |
48 | PLATFORM=yopy-linux |
49 | endif |
49 | endif |
50 | ifdef CONFIG_TARGET_MACOSX |
50 | ifdef CONFIG_TARGET_MACOSX |
51 | PLATFORM=macx-darwin |
51 | PLATFORM=macx-darwin |
52 | endif |
52 | endif |
| |
53 | ifdef CONFIG_TARGET_HTC |
| |
54 | PLATFORM=htc-linux |
| |
55 | endif |
53 | |
56 | |
54 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
57 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
55 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
58 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
56 | |
59 | |
57 | ifeq ($(QPE_VERSION),) |
60 | ifeq ($(QPE_VERSION),) |
58 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
61 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
59 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
62 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
60 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
63 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
61 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
64 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
62 | |
65 | |
63 | ifeq ($(QPE_VERSION),..) |
66 | ifeq ($(QPE_VERSION),..) |
64 | QPE_VERSION=1.1.2 |
67 | QPE_VERSION=1.1.2 |
65 | endif |
68 | endif |
66 | endif |
69 | endif |
67 | export QPE_VERSION |
70 | export QPE_VERSION |
68 | |
71 | |
69 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
72 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
70 | ifeq ($(VERSION_CVS),) |
73 | ifeq ($(VERSION_CVS),) |
71 | VERSION_CVS:=$(shell date +%s) |
74 | VERSION_CVS:=$(shell date +%s) |
72 | endif |
75 | endif |
73 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
76 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
74 | SUB_VERSION:=$(VERSION_CVS) |
77 | SUB_VERSION:=$(VERSION_CVS) |
75 | endif |
78 | endif |
76 | export SUB_VERSION |
79 | export SUB_VERSION |
77 | |
80 | |
78 | ifneq ($(strip $(SUB_VERSION)),) |
81 | ifneq ($(strip $(SUB_VERSION)),) |
79 | EXTRAVERSION=-$(SUB_VERSION) |
82 | EXTRAVERSION=-$(SUB_VERSION) |
80 | endif |
83 | endif |
81 | |
84 | |
82 | ifeq ($(QTE_REVISION),) |
85 | ifeq ($(QTE_REVISION),) |
83 | QTE_REVISION=6 |
86 | QTE_REVISION=6 |
84 | endif |
87 | endif |
85 | export QTE_REVISION |
88 | export QTE_REVISION |
86 | |
89 | |
87 | export DEB_VERSION=2.0 |
90 | export DEB_VERSION=2.0 |
88 | |
91 | |
89 | ifeq ($(QTE_BASEVERSION),) |
92 | ifeq ($(QTE_BASEVERSION),) |
90 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
93 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
91 | 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/;') |
94 | 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/;') |
92 | else |
95 | else |
93 | QTE_BASEVERSION=2.3.7 |
96 | QTE_BASEVERSION=2.3.7 |
94 | endif |
97 | endif |
95 | endif |
98 | endif |
96 | export QTE_BASEVERSION |
99 | export QTE_BASEVERSION |
97 | |
100 | |
98 | ifeq ($(QTE_VERSION),) |
101 | ifeq ($(QTE_VERSION),) |
99 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
102 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
100 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
103 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
101 | else |
104 | else |
102 | QTE_VERSION=2.3.7 |
105 | QTE_VERSION=2.3.7 |
103 | endif |
106 | endif |
104 | endif |
107 | endif |
105 | export QTE_VERSION |
108 | export QTE_VERSION |
106 | |
109 | |
107 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
110 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
108 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
111 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
109 | |
112 | |
110 | ifdef CONFIG_OPTIMIZATIONS |
113 | ifdef CONFIG_OPTIMIZATIONS |
111 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
114 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
112 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
115 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
113 | endif |
116 | endif |
114 | |
117 | |
115 | ifeq ($(STRIP),) |
118 | ifeq ($(STRIP),) |
116 | ifneq ($(CONFIG_TARGET_X86),) |
119 | ifneq ($(CONFIG_TARGET_X86),) |
117 | STRIP=strip |
120 | STRIP=strip |
118 | endif |
121 | endif |
119 | ifneq ($(CONFIG_TARGET_64BIT),) |
122 | ifneq ($(CONFIG_TARGET_64BIT),) |
120 | STRIP=strip |
123 | STRIP=strip |
121 | endif |
124 | endif |
122 | ifneq ($(CONFIG_TARGET_IPAQ),) |
125 | ifneq ($(CONFIG_TARGET_IPAQ),) |
123 | STRIP=arm-linux-strip |
126 | STRIP=arm-linux-strip |
124 | endif |
127 | endif |
125 | ifneq ($(CONFIG_TARGET_SHARP),) |
128 | ifneq ($(CONFIG_TARGET_SHARP),) |
126 | STRIP=arm-linux-strip |
129 | STRIP=arm-linux-strip |
127 | endif |
130 | endif |
128 | ifneq ($(CONFIG_TARGET_RAMSES),) |
131 | ifneq ($(CONFIG_TARGET_RAMSES),) |
129 | STRIP=arm-linux-strip |
132 | STRIP=arm-linux-strip |
130 | endif |
133 | endif |
131 | ifneq ($(CONFIG_TARGET_SIMPAD),) |
134 | ifneq ($(CONFIG_TARGET_SIMPAD),) |
132 | STRIP=arm-linux-strip |
135 | STRIP=arm-linux-strip |
133 | endif |
136 | endif |
134 | ifneq ($(CONFIG_TARGET_YOPY),) |
137 | ifneq ($(CONFIG_TARGET_YOPY),) |
135 | STRIP=arm-linux-strip |
138 | STRIP=arm-linux-strip |
136 | endif |
139 | endif |
137 | endif |
140 | endif |
138 | |
141 | |
|