author | mickeyl <mickeyl> | 2003-12-09 23:01:54 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-09 23:01:54 (UTC) |
commit | b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6 (patch) (unidiff) | |
tree | 061c027992e37c407ab92d19808833d0639ea3a6 | |
parent | 6b45c1f8e0293914c1328f15a665d2ea0fba7b43 (diff) | |
download | opie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.zip opie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.tar.gz opie-b2dc1cd012f2426b3ffa5b29879cf1760cfbc2e6.tar.bz2 |
adjust and update some variables
-rw-r--r-- | Vars.make | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -19,103 +19,103 @@ ifdef CONFIG_TARGET_X86 | |||
19 | PLATFORM=x86-linux | 19 | PLATFORM=x86-linux |
20 | endif | 20 | endif |
21 | ifdef CONFIG_TARGET_SHARP | 21 | ifdef CONFIG_TARGET_SHARP |
22 | PLATFORM=sharp-linux | 22 | PLATFORM=sharp-linux |
23 | endif | 23 | endif |
24 | ifdef CONFIG_TARGET_IPAQ | 24 | ifdef CONFIG_TARGET_IPAQ |
25 | PLATFORM=ipaq-linux | 25 | PLATFORM=ipaq-linux |
26 | endif | 26 | endif |
27 | ifdef CONFIG_TARGET_RAMSES | 27 | ifdef CONFIG_TARGET_RAMSES |
28 | PLATFORM=ramses-linux | 28 | PLATFORM=ramses-linux |
29 | endif | 29 | endif |
30 | ifdef CONFIG_TARGET_SIMPAD | 30 | ifdef CONFIG_TARGET_SIMPAD |
31 | PLATFORM=simpad-linux | 31 | PLATFORM=simpad-linux |
32 | endif | 32 | endif |
33 | 33 | ||
34 | ifdef CONFIG_TARGET_YOPY | 34 | ifdef CONFIG_TARGET_YOPY |
35 | PLATFORM=yopy-linux | 35 | PLATFORM=yopy-linux |
36 | endif | 36 | endif |
37 | ifdef CONFIG_TARGET_MACOSX | 37 | ifdef CONFIG_TARGET_MACOSX |
38 | PLATFORM=macx-darwin | 38 | PLATFORM=macx-darwin |
39 | endif | 39 | endif |
40 | 40 | ||
41 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 41 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
42 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 42 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
43 | 43 | ||
44 | ifeq ($(QPE_VERSION),) | 44 | ifeq ($(QPE_VERSION),) |
45 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 45 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
46 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 46 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
47 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) | 47 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
48 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) | 48 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
49 | 49 | ||
50 | ifeq ($(QPE_VERSION),..) | 50 | ifeq ($(QPE_VERSION),..) |
51 | QPE_VERSION=0.9.3 | 51 | QPE_VERSION=1.1.0 |
52 | endif | 52 | endif |
53 | endif | 53 | endif |
54 | export QPE_VERSION | 54 | export QPE_VERSION |
55 | 55 | ||
56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) | 56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
57 | ifeq ($(VERSION_CVS),) | 57 | ifeq ($(VERSION_CVS),) |
58 | VERSION_CVS:=$(shell date +%Y%m%d) | 58 | VERSION_CVS:=$(shell date +%Y%m%d) |
59 | endif | 59 | endif |
60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) | 60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
61 | SUB_VERSION:=$(VERSION_CVS) | 61 | SUB_VERSION:=$(VERSION_CVS) |
62 | endif | 62 | endif |
63 | export SUB_VERSION | 63 | export SUB_VERSION |
64 | 64 | ||
65 | ifneq ($(strip $(SUB_VERSION)),) | 65 | ifneq ($(strip $(SUB_VERSION)),) |
66 | EXTRAVERSION=-$(SUB_VERSION) | 66 | EXTRAVERSION=-$(SUB_VERSION) |
67 | endif | 67 | endif |
68 | 68 | ||
69 | ifeq ($(QTE_REVISION),) | 69 | ifeq ($(QTE_REVISION),) |
70 | QTE_REVISION=5 | 70 | QTE_REVISION=6 |
71 | endif | 71 | endif |
72 | export QTE_REVISION | 72 | export QTE_REVISION |
73 | 73 | ||
74 | export DEB_VERSION=2.0 | 74 | export DEB_VERSION=2.0 |
75 | 75 | ||
76 | ifeq ($(QTE_BASEVERSION),) | 76 | ifeq ($(QTE_BASEVERSION),) |
77 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 77 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
78 | 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/;') | 78 | 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/;') |
79 | else | 79 | else |
80 | QTE_BASEVERSION=2.3.5 | 80 | QTE_BASEVERSION=2.3.7 |
81 | endif | 81 | endif |
82 | endif | 82 | endif |
83 | export QTE_BASEVERSION | 83 | export QTE_BASEVERSION |
84 | 84 | ||
85 | ifeq ($(QTE_VERSION),) | 85 | ifeq ($(QTE_VERSION),) |
86 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 86 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
87 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') | 87 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
88 | else | 88 | else |
89 | QTE_VERSION=2.3.5 | 89 | QTE_VERSION=2.3.7 |
90 | endif | 90 | endif |
91 | endif | 91 | endif |
92 | export QTE_VERSION | 92 | export QTE_VERSION |
93 | 93 | ||
94 | export PATH:=$(OPIEDIR)/scripts:$(PATH) | 94 | export PATH:=$(OPIEDIR)/scripts:$(PATH) |
95 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) | 95 | export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
96 | 96 | ||
97 | ifdef CONFIG_OPTIMIZATIONS | 97 | ifdef CONFIG_OPTIMIZATIONS |
98 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) | 98 | export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) |
99 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) | 99 | export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) |
100 | endif | 100 | endif |
101 | 101 | ||
102 | ifeq ($(STRIP),) | 102 | ifeq ($(STRIP),) |
103 | ifneq ($(CONFIG_TARGET_X86),) | 103 | ifneq ($(CONFIG_TARGET_X86),) |
104 | STRIP=strip | 104 | STRIP=strip |
105 | endif | 105 | endif |
106 | ifneq ($(CONFIG_TARGET_IPAQ),) | 106 | ifneq ($(CONFIG_TARGET_IPAQ),) |
107 | STRIP=arm-linux-strip | 107 | STRIP=arm-linux-strip |
108 | endif | 108 | endif |
109 | ifneq ($(CONFIG_TARGET_SHARP),) | 109 | ifneq ($(CONFIG_TARGET_SHARP),) |
110 | STRIP=arm-linux-strip | 110 | STRIP=arm-linux-strip |
111 | endif | 111 | endif |
112 | ifneq ($(CONFIG_TARGET_RAMSES),) | 112 | ifneq ($(CONFIG_TARGET_RAMSES),) |
113 | STRIP=arm-linux-strip | 113 | STRIP=arm-linux-strip |
114 | endif | 114 | endif |
115 | ifneq ($(CONFIG_TARGET_SIMPAD),) | 115 | ifneq ($(CONFIG_TARGET_SIMPAD),) |
116 | STRIP=arm-linux-strip | 116 | STRIP=arm-linux-strip |
117 | endif | 117 | endif |
118 | ifneq ($(CONFIG_TARGET_YOPY),) | 118 | ifneq ($(CONFIG_TARGET_YOPY),) |
119 | STRIP=arm-linux-strip | 119 | STRIP=arm-linux-strip |
120 | endif | 120 | endif |
121 | endif | 121 | endif |