author | ar <ar> | 2004-10-17 10:40:42 (UTC) |
---|---|---|
committer | ar <ar> | 2004-10-17 10:40:42 (UTC) |
commit | 054918af08eb6041e3e5400c2024bc39e472fd8d (patch) (unidiff) | |
tree | 59018da78313bef031f14f09c46ce8784800884e /Vars.make | |
parent | 1deb4b9d09fcb0eddd8425de7d66e8919e1e0d32 (diff) | |
download | opie-054918af08eb6041e3e5400c2024bc39e472fd8d.zip opie-054918af08eb6041e3e5400c2024bc39e472fd8d.tar.gz opie-054918af08eb6041e3e5400c2024bc39e472fd8d.tar.bz2 |
- only set CCACHE_PREFIX when distcc is installed.
remove buildrpoblems on machines without distcc (file not found on make)
-rw-r--r-- | Vars.make | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -61,66 +61,67 @@ ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VER | |||
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=6 | 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.7 | 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.7 | 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 |
122 | 122 | ||
123 | export CCACHE=$(shell which ccache 2>/dev/null) | 123 | export CCACHE=$(shell which ccache 2>/dev/null) |
124 | export DISTCC=$(shell which distcc 2>/dev/null) | 124 | export DISTCC=$(shell which distcc 2>/dev/null) |
125 | export CCACHE_PREFIX=$(shell which distcc &>/dev/null && echo distcc) | 125 | ifneq ($(DISTCC),) |
126 | 126 | export CCACHE_PREFIX=$(shell which distcc &>/dev/null && echo distcc) | |
127 | endif | ||