|
diff --git a/Vars.make b/Vars.make index fe4f397..1413282 100644 --- a/ Vars.make+++ b/ Vars.make |
|
@@ -1,56 +1,56 @@ |
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)) |
|