|
diff --git a/Vars.make b/Vars.make index 82421e5..330b455 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -1,85 +1,88 @@ |
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 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
18 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
19 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
19 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
20 | |
20 | |
21 | ifeq ($(QPE_VERSION),) |
21 | ifeq ($(QPE_VERSION),) |
22 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
22 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
23 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
23 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
24 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
24 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
25 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
25 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
26 | |
26 | |
27 | ifeq ($(QPE_VERSION),..) |
27 | ifeq ($(QPE_VERSION),..) |
28 | QPE_VERSION=0.9.3 |
28 | QPE_VERSION=0.9.3 |
29 | endif |
29 | endif |
30 | endif |
30 | endif |
31 | export QPE_VERSION |
31 | export QPE_VERSION |
32 | |
32 | |
33 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
33 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
34 | ifeq ($(VERSION_CVS),) |
34 | ifeq ($(VERSION_CVS),) |
35 | VERSION_CVS:=$(shell date +%Y%m%d) |
35 | VERSION_CVS:=$(shell date +%Y%m%d) |
36 | endif |
36 | endif |
37 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
37 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
38 | SUB_VERSION:=$(VERSION_CVS) |
38 | SUB_VERSION:=$(VERSION_CVS) |
39 | endif |
39 | endif |
40 | export SUB_VERSION |
40 | export SUB_VERSION |
41 | |
41 | |
42 | ifeq ($(QTE_REVISION),) |
42 | ifeq ($(QTE_REVISION),) |
43 | QTE_REVISION=5 |
43 | QTE_REVISION=5 |
44 | endif |
44 | endif |
45 | export QTE_REVISION |
45 | export QTE_REVISION |
46 | |
46 | |
47 | export DEB_VERSION=2.0 |
47 | export DEB_VERSION=2.0 |
48 | |
48 | |
49 | ifeq ($(QTE_BASEVERSION),) |
49 | ifeq ($(QTE_BASEVERSION),) |
50 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
50 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
51 | 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/;') |
51 | 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/;') |
52 | else |
52 | else |
53 | QTE_BASEVERSION=2.3.5 |
53 | QTE_BASEVERSION=2.3.5 |
54 | endif |
54 | endif |
55 | endif |
55 | endif |
56 | export QTE_BASEVERSION |
56 | export QTE_BASEVERSION |
57 | |
57 | |
58 | ifeq ($(QTE_VERSION),) |
58 | ifeq ($(QTE_VERSION),) |
59 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
59 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
60 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
60 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
61 | else |
61 | else |
62 | QTE_VERSION=2.3.5 |
62 | QTE_VERSION=2.3.5 |
63 | endif |
63 | endif |
64 | endif |
64 | endif |
65 | export QTE_VERSION |
65 | export QTE_VERSION |
66 | |
66 | |
67 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
67 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
68 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
68 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
69 | |
69 | |
70 | ifdef CONFIG_OPTIMIZATIONS |
70 | ifdef CONFIG_OPTIMIZATIONS |
71 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
71 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
72 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
72 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
73 | endif |
73 | endif |
74 | |
74 | |
75 | ifeq ($(STRIP),) |
75 | ifeq ($(STRIP),) |
76 | ifneq ($(CONFIG_TARGET_X86),) |
76 | ifneq ($(CONFIG_TARGET_X86),) |
77 | STRIP=strip |
77 | STRIP=strip |
78 | endif |
78 | endif |
79 | ifneq ($(CONFIG_TARGET_IPAQ),) |
79 | ifneq ($(CONFIG_TARGET_IPAQ),) |
80 | STRIP=arm-linux-strip |
80 | STRIP=arm-linux-strip |
81 | endif |
81 | endif |
82 | ifneq ($(CONFIG_TARGET_SHARP),) |
82 | ifneq ($(CONFIG_TARGET_SHARP),) |
83 | STRIP=arm-linux-strip |
83 | STRIP=arm-linux-strip |
84 | endif |
84 | endif |
| |
85 | ifneq ($(CONFIG_TARGET_RAMSES),) |
| |
86 | STRIP=arm-linux-strip |
| |
87 | endif |
85 | endif |
88 | endif |
|