|
diff --git a/Vars.make b/Vars.make index 238918f..fe4f397 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -1,87 +1,88 @@ |
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:=$(CONFIG_OE_BUILD_DIR) |
19 | OEDIR:=$(CONFIG_OE_BUILD_DIR) |
20 | QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 |
20 | QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 |
21 | $(shell mkdir -p $(QTDIR)/src/moc) |
21 | $(shell mkdir -p $(QTDIR)/src/moc) |
22 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) |
22 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) |
23 | PLATFORM=sharp-linux |
23 | PLATFORM=sharp-linux |
| |
24 | OEHOSTSYS:=$(CONFIG_OE_HOST_SYS) |
24 | endif |
25 | endif |
25 | |
26 | |
26 | ifdef CONFIG_TARGET_X86 |
27 | ifdef CONFIG_TARGET_X86 |
27 | PLATFORM=x86-linux |
28 | PLATFORM=x86-linux |
28 | endif |
29 | endif |
29 | ifdef CONFIG_TARGET_SHARP |
30 | ifdef CONFIG_TARGET_SHARP |
30 | PLATFORM=sharp-linux |
31 | PLATFORM=sharp-linux |
31 | endif |
32 | endif |
32 | ifdef CONFIG_TARGET_IPAQ |
33 | ifdef CONFIG_TARGET_IPAQ |
33 | PLATFORM=ipaq-linux |
34 | PLATFORM=ipaq-linux |
34 | endif |
35 | endif |
35 | ifdef CONFIG_TARGET_RAMSES |
36 | ifdef CONFIG_TARGET_RAMSES |
36 | PLATFORM=ramses-linux |
37 | PLATFORM=ramses-linux |
37 | endif |
38 | endif |
38 | ifdef CONFIG_TARGET_SIMPAD |
39 | ifdef CONFIG_TARGET_SIMPAD |
39 | PLATFORM=simpad-linux |
40 | PLATFORM=simpad-linux |
40 | endif |
41 | endif |
41 | |
42 | |
42 | ifdef CONFIG_TARGET_YOPY |
43 | ifdef CONFIG_TARGET_YOPY |
43 | PLATFORM=yopy-linux |
44 | PLATFORM=yopy-linux |
44 | endif |
45 | endif |
45 | ifdef CONFIG_TARGET_MACOSX |
46 | ifdef CONFIG_TARGET_MACOSX |
46 | PLATFORM=macx-darwin |
47 | PLATFORM=macx-darwin |
47 | endif |
48 | endif |
48 | |
49 | |
49 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
50 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
50 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
51 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
51 | |
52 | |
52 | ifeq ($(QPE_VERSION),) |
53 | ifeq ($(QPE_VERSION),) |
53 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
54 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
54 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
55 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
55 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
56 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
56 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
57 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
57 | |
58 | |
58 | ifeq ($(QPE_VERSION),..) |
59 | ifeq ($(QPE_VERSION),..) |
59 | QPE_VERSION=1.1.2 |
60 | QPE_VERSION=1.1.2 |
60 | endif |
61 | endif |
61 | endif |
62 | endif |
62 | export QPE_VERSION |
63 | export QPE_VERSION |
63 | |
64 | |
64 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
65 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
65 | ifeq ($(VERSION_CVS),) |
66 | ifeq ($(VERSION_CVS),) |
66 | VERSION_CVS:=$(shell date +%s) |
67 | VERSION_CVS:=$(shell date +%s) |
67 | endif |
68 | endif |
68 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
69 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
69 | SUB_VERSION:=$(VERSION_CVS) |
70 | SUB_VERSION:=$(VERSION_CVS) |
70 | endif |
71 | endif |
71 | export SUB_VERSION |
72 | export SUB_VERSION |
72 | |
73 | |
73 | ifneq ($(strip $(SUB_VERSION)),) |
74 | ifneq ($(strip $(SUB_VERSION)),) |
74 | EXTRAVERSION=-$(SUB_VERSION) |
75 | EXTRAVERSION=-$(SUB_VERSION) |
75 | endif |
76 | endif |
76 | |
77 | |
77 | ifeq ($(QTE_REVISION),) |
78 | ifeq ($(QTE_REVISION),) |
78 | QTE_REVISION=6 |
79 | QTE_REVISION=6 |
79 | endif |
80 | endif |
80 | export QTE_REVISION |
81 | export QTE_REVISION |
81 | |
82 | |
82 | export DEB_VERSION=2.0 |
83 | export DEB_VERSION=2.0 |
83 | |
84 | |
84 | ifeq ($(QTE_BASEVERSION),) |
85 | ifeq ($(QTE_BASEVERSION),) |
85 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
86 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
86 | 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/;') |
87 | 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/;') |
87 | else |
88 | else |
|