summaryrefslogtreecommitdiff
authorar <ar>2005-01-24 22:41:03 (UTC)
committer ar <ar>2005-01-24 22:41:03 (UTC)
commitd3ca4c7807c7a22837e481c1016c9814a68e00fb (patch) (unidiff)
tree9c650cbd159bcec44d10e0b6023c6447a12a7678
parent3d4c2eb3932f024bd046e8c4ac747d147a823d63 (diff)
downloadopie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.zip
opie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.tar.gz
opie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.tar.bz2
- clear OEDIR & co from " for crosscompile opie against OpenEmbedded stage
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make6
1 files changed, 3 insertions, 3 deletions
diff --git a/Vars.make b/Vars.make
index fe4f397..1413282 100644
--- a/Vars.make
+++ b/Vars.make
@@ -1,131 +1,131 @@
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:=$(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')
25endif 25endif
26 26
27ifdef CONFIG_TARGET_X86 27ifdef CONFIG_TARGET_X86
28 PLATFORM=x86-linux 28 PLATFORM=x86-linux
29endif 29endif
30ifdef CONFIG_TARGET_SHARP 30ifdef CONFIG_TARGET_SHARP
31 PLATFORM=sharp-linux 31 PLATFORM=sharp-linux
32endif 32endif
33ifdef CONFIG_TARGET_IPAQ 33ifdef CONFIG_TARGET_IPAQ
34 PLATFORM=ipaq-linux 34 PLATFORM=ipaq-linux
35endif 35endif
36ifdef CONFIG_TARGET_RAMSES 36ifdef CONFIG_TARGET_RAMSES
37 PLATFORM=ramses-linux 37 PLATFORM=ramses-linux
38endif 38endif
39ifdef CONFIG_TARGET_SIMPAD 39ifdef CONFIG_TARGET_SIMPAD
40 PLATFORM=simpad-linux 40 PLATFORM=simpad-linux
41endif 41endif
42 42
43ifdef CONFIG_TARGET_YOPY 43ifdef CONFIG_TARGET_YOPY
44 PLATFORM=yopy-linux 44 PLATFORM=yopy-linux
45endif 45endif
46ifdef CONFIG_TARGET_MACOSX 46ifdef CONFIG_TARGET_MACOSX
47 PLATFORM=macx-darwin 47 PLATFORM=macx-darwin
48endif 48endif
49 49
50export QMAKE:=$(OPIEDIR)/qmake/qmake 50export QMAKE:=$(OPIEDIR)/qmake/qmake
51export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 51export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
52 52
53ifeq ($(QPE_VERSION),) 53ifeq ($(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
62endif 62endif
63export QPE_VERSION 63export QPE_VERSION
64 64
65SUB_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))
66ifeq ($(VERSION_CVS),) 66ifeq ($(VERSION_CVS),)
67 VERSION_CVS:=$(shell date +%s) 67 VERSION_CVS:=$(shell date +%s)
68endif 68endif
69ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 69ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
70 SUB_VERSION:=$(VERSION_CVS) 70 SUB_VERSION:=$(VERSION_CVS)
71endif 71endif
72export SUB_VERSION 72export SUB_VERSION
73 73
74ifneq ($(strip $(SUB_VERSION)),) 74ifneq ($(strip $(SUB_VERSION)),)
75EXTRAVERSION=-$(SUB_VERSION) 75EXTRAVERSION=-$(SUB_VERSION)
76endif 76endif
77 77
78ifeq ($(QTE_REVISION),) 78ifeq ($(QTE_REVISION),)
79 QTE_REVISION=6 79 QTE_REVISION=6
80endif 80endif
81export QTE_REVISION 81export QTE_REVISION
82 82
83export DEB_VERSION=2.0 83export DEB_VERSION=2.0
84 84
85ifeq ($(QTE_BASEVERSION),) 85ifeq ($(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
89 QTE_BASEVERSION=2.3.7 89 QTE_BASEVERSION=2.3.7
90 endif 90 endif
91endif 91endif
92export QTE_BASEVERSION 92export QTE_BASEVERSION
93 93
94ifeq ($(QTE_VERSION),) 94ifeq ($(QTE_VERSION),)
95 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) 95 ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
96 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') 96 QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
97 else 97 else
98 QTE_VERSION=2.3.7 98 QTE_VERSION=2.3.7
99 endif 99 endif
100endif 100endif
101export QTE_VERSION 101export QTE_VERSION
102 102
103export PATH:=$(OPIEDIR)/scripts:$(PATH) 103export PATH:=$(OPIEDIR)/scripts:$(PATH)
104export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 104export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
105 105
106ifdef CONFIG_OPTIMIZATIONS 106ifdef CONFIG_OPTIMIZATIONS
107export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 107export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
108export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 108export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
109endif 109endif
110 110
111ifeq ($(STRIP),) 111ifeq ($(STRIP),)
112 ifneq ($(CONFIG_TARGET_X86),) 112 ifneq ($(CONFIG_TARGET_X86),)
113 STRIP=strip 113 STRIP=strip
114 endif 114 endif
115 ifneq ($(CONFIG_TARGET_IPAQ),) 115 ifneq ($(CONFIG_TARGET_IPAQ),)
116 STRIP=arm-linux-strip 116 STRIP=arm-linux-strip
117 endif 117 endif
118 ifneq ($(CONFIG_TARGET_SHARP),) 118 ifneq ($(CONFIG_TARGET_SHARP),)
119 STRIP=arm-linux-strip 119 STRIP=arm-linux-strip
120 endif 120 endif
121 ifneq ($(CONFIG_TARGET_RAMSES),) 121 ifneq ($(CONFIG_TARGET_RAMSES),)
122 STRIP=arm-linux-strip 122 STRIP=arm-linux-strip
123 endif 123 endif
124 ifneq ($(CONFIG_TARGET_SIMPAD),) 124 ifneq ($(CONFIG_TARGET_SIMPAD),)
125 STRIP=arm-linux-strip 125 STRIP=arm-linux-strip
126 endif 126 endif
127 ifneq ($(CONFIG_TARGET_YOPY),) 127 ifneq ($(CONFIG_TARGET_YOPY),)
128 STRIP=arm-linux-strip 128 STRIP=arm-linux-strip
129 endif 129 endif
130endif 130endif
131 131