summaryrefslogtreecommitdiff
path: root/Vars.make
Unidiff
Diffstat (limited to 'Vars.make') (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make1
1 files changed, 1 insertions, 0 deletions
diff --git a/Vars.make b/Vars.make
index 238918f..fe4f397 100644
--- a/Vars.make
+++ b/Vars.make
@@ -1,87 +1,88 @@
1prefix=/opt/QtPalmtop 1prefix=/opt/QtPalmtop
2 2
3ifeq ($(OPIEDIR),) 3ifeq ($(OPIEDIR),)
4 export OPIEDIR:=$(TOPDIR) 4 export OPIEDIR:=$(TOPDIR)
5endif 5endif
6ifeq ($(IPK_DIR),) 6ifeq ($(IPK_DIR),)
7 export IPK_DIR:=$(OPIEDIR) 7 export IPK_DIR:=$(OPIEDIR)
8endif 8endif
9 9
10ifneq ($(wildcard $(TOPDIR)/.config),) 10ifneq ($(wildcard $(TOPDIR)/.config),)
11 include $(TOPDIR)/.config 11 include $(TOPDIR)/.config
12endif 12endif
13 13
14ifndef CONFIG_TARGET_OE 14ifndef CONFIG_TARGET_OE
15 ifndef QTDIR 15 ifndef QTDIR
16 $(error QTDIR not set) 16 $(error QTDIR not set)
17 endif 17 endif
18else 18else
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)
24endif 25endif
25 26
26ifdef CONFIG_TARGET_X86 27ifdef CONFIG_TARGET_X86
27 PLATFORM=x86-linux 28 PLATFORM=x86-linux
28endif 29endif
29ifdef CONFIG_TARGET_SHARP 30ifdef CONFIG_TARGET_SHARP
30 PLATFORM=sharp-linux 31 PLATFORM=sharp-linux
31endif 32endif
32ifdef CONFIG_TARGET_IPAQ 33ifdef CONFIG_TARGET_IPAQ
33 PLATFORM=ipaq-linux 34 PLATFORM=ipaq-linux
34endif 35endif
35ifdef CONFIG_TARGET_RAMSES 36ifdef CONFIG_TARGET_RAMSES
36 PLATFORM=ramses-linux 37 PLATFORM=ramses-linux
37endif 38endif
38ifdef CONFIG_TARGET_SIMPAD 39ifdef CONFIG_TARGET_SIMPAD
39 PLATFORM=simpad-linux 40 PLATFORM=simpad-linux
40endif 41endif
41 42
42ifdef CONFIG_TARGET_YOPY 43ifdef CONFIG_TARGET_YOPY
43 PLATFORM=yopy-linux 44 PLATFORM=yopy-linux
44endif 45endif
45ifdef CONFIG_TARGET_MACOSX 46ifdef CONFIG_TARGET_MACOSX
46 PLATFORM=macx-darwin 47 PLATFORM=macx-darwin
47endif 48endif
48 49
49export QMAKE:=$(OPIEDIR)/qmake/qmake 50export QMAKE:=$(OPIEDIR)/qmake/qmake
50export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 51export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
51 52
52ifeq ($(QPE_VERSION),) 53ifeq ($(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
61endif 62endif
62export QPE_VERSION 63export QPE_VERSION
63 64
64SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 65SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
65ifeq ($(VERSION_CVS),) 66ifeq ($(VERSION_CVS),)
66 VERSION_CVS:=$(shell date +%s) 67 VERSION_CVS:=$(shell date +%s)
67endif 68endif
68ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 69ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
69 SUB_VERSION:=$(VERSION_CVS) 70 SUB_VERSION:=$(VERSION_CVS)
70endif 71endif
71export SUB_VERSION 72export SUB_VERSION
72 73
73ifneq ($(strip $(SUB_VERSION)),) 74ifneq ($(strip $(SUB_VERSION)),)
74EXTRAVERSION=-$(SUB_VERSION) 75EXTRAVERSION=-$(SUB_VERSION)
75endif 76endif
76 77
77ifeq ($(QTE_REVISION),) 78ifeq ($(QTE_REVISION),)
78 QTE_REVISION=6 79 QTE_REVISION=6
79endif 80endif
80export QTE_REVISION 81export QTE_REVISION
81 82
82export DEB_VERSION=2.0 83export DEB_VERSION=2.0
83 84
84ifeq ($(QTE_BASEVERSION),) 85ifeq ($(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