author | ar <ar> | 2005-01-24 22:41:03 (UTC) |
---|---|---|
committer | ar <ar> | 2005-01-24 22:41:03 (UTC) |
commit | d3ca4c7807c7a22837e481c1016c9814a68e00fb (patch) (unidiff) | |
tree | 9c650cbd159bcec44d10e0b6023c6447a12a7678 /Vars.make | |
parent | 3d4c2eb3932f024bd046e8c4ac747d147a823d63 (diff) | |
download | opie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.zip opie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.tar.gz opie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.tar.bz2 |
- clear OEDIR & co from " for crosscompile opie against OpenEmbedded stage
-rw-r--r-- | Vars.make | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,88 +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:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g') |
20 | QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 | 20 | QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/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 | OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g') |
25 | endif | 25 | endif |
26 | 26 | ||
27 | ifdef CONFIG_TARGET_X86 | 27 | ifdef CONFIG_TARGET_X86 |
28 | PLATFORM=x86-linux | 28 | PLATFORM=x86-linux |
29 | endif | 29 | endif |
30 | ifdef CONFIG_TARGET_SHARP | 30 | ifdef CONFIG_TARGET_SHARP |
31 | PLATFORM=sharp-linux | 31 | PLATFORM=sharp-linux |
32 | endif | 32 | endif |
33 | ifdef CONFIG_TARGET_IPAQ | 33 | ifdef CONFIG_TARGET_IPAQ |
34 | PLATFORM=ipaq-linux | 34 | PLATFORM=ipaq-linux |
35 | endif | 35 | endif |
36 | ifdef CONFIG_TARGET_RAMSES | 36 | ifdef CONFIG_TARGET_RAMSES |
37 | PLATFORM=ramses-linux | 37 | PLATFORM=ramses-linux |
38 | endif | 38 | endif |
39 | ifdef CONFIG_TARGET_SIMPAD | 39 | ifdef CONFIG_TARGET_SIMPAD |
40 | PLATFORM=simpad-linux | 40 | PLATFORM=simpad-linux |
41 | endif | 41 | endif |
42 | 42 | ||
43 | ifdef CONFIG_TARGET_YOPY | 43 | ifdef CONFIG_TARGET_YOPY |
44 | PLATFORM=yopy-linux | 44 | PLATFORM=yopy-linux |
45 | endif | 45 | endif |
46 | ifdef CONFIG_TARGET_MACOSX | 46 | ifdef CONFIG_TARGET_MACOSX |
47 | PLATFORM=macx-darwin | 47 | PLATFORM=macx-darwin |
48 | endif | 48 | endif |
49 | 49 | ||
50 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 50 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
51 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 51 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
52 | 52 | ||
53 | ifeq ($(QPE_VERSION),) | 53 | ifeq ($(QPE_VERSION),) |
54 | 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)) |
55 | 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)) |
56 | 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)) |
57 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) | 57 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
58 | 58 | ||
59 | ifeq ($(QPE_VERSION),..) | 59 | ifeq ($(QPE_VERSION),..) |
60 | QPE_VERSION=1.1.2 | 60 | QPE_VERSION=1.1.2 |
61 | endif | 61 | endif |
62 | endif | 62 | endif |
63 | export QPE_VERSION | 63 | export QPE_VERSION |
64 | 64 | ||
65 | 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)) |
66 | ifeq ($(VERSION_CVS),) | 66 | ifeq ($(VERSION_CVS),) |
67 | VERSION_CVS:=$(shell date +%s) | 67 | VERSION_CVS:=$(shell date +%s) |
68 | endif | 68 | endif |
69 | 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)),) |
70 | SUB_VERSION:=$(VERSION_CVS) | 70 | SUB_VERSION:=$(VERSION_CVS) |
71 | endif | 71 | endif |
72 | export SUB_VERSION | 72 | export SUB_VERSION |
73 | 73 | ||
74 | ifneq ($(strip $(SUB_VERSION)),) | 74 | ifneq ($(strip $(SUB_VERSION)),) |
75 | EXTRAVERSION=-$(SUB_VERSION) | 75 | EXTRAVERSION=-$(SUB_VERSION) |
76 | endif | 76 | endif |
77 | 77 | ||
78 | ifeq ($(QTE_REVISION),) | 78 | ifeq ($(QTE_REVISION),) |
79 | QTE_REVISION=6 | 79 | QTE_REVISION=6 |
80 | endif | 80 | endif |
81 | export QTE_REVISION | 81 | export QTE_REVISION |
82 | 82 | ||
83 | export DEB_VERSION=2.0 | 83 | export DEB_VERSION=2.0 |
84 | 84 | ||
85 | ifeq ($(QTE_BASEVERSION),) | 85 | ifeq ($(QTE_BASEVERSION),) |
86 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 86 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
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 | 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/;') |
88 | else | 88 | else |